Hello all,
while investigating Georg's problem I had to apply the attached patch to
make the Qt4 code compile (it had problems finding the Qt headers). I
did not want to apply the patch right away, because I was wondering if
this is a problem with the way Fedora organizes the Qt headers or the
configure/make build system?
If you use 1.8 + Qt4 I'd appreciate if you could let me know where your
Qt headers are and how you configure/build OpenSG. Or perhaps you have
something like the attached applied locally?
Thanks,
Carsten
? WindowSystem/GLUT/testFboMemLeak.cpp
? WindowSystem/QT4/OSGWindowQT4Plugin_qt.cpp.DISABLED
? WindowSystem/QT4/OSGWindowQT4Plugin_qt.h.DISABLED
Index: WindowSystem/QT4/OSGQ4FieldContainerView_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldContainerView_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldContainerView_qt.cpp
--- WindowSystem/QT4/OSGQ4FieldContainerView_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldContainerView_qt.cpp 23 Jan 2010 20:32:04 -0000
@@ -41,12 +41,12 @@
#include <OSGField.h>
-#include <qpalette.h>
-#include <qevent.h>
-#include <qrect.h>
-#include <qsize.h>
+#include <QtGui/QPalette>
+#include <QtCore/QEvent>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
//Added by qt3to4:
-#include <QResizeEvent>
+#include <QtGui/QResizeEvent>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/OSGQ4FieldContainerView_qt.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldContainerView_qt.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldContainerView_qt.h
--- WindowSystem/QT4/OSGQ4FieldContainerView_qt.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldContainerView_qt.h 23 Jan 2010 20:32:04 -0000
@@ -46,10 +46,10 @@
#include <OSGFieldContainer.h>
-#include <qwidget.h>
-#include <q3table.h>
+#include <Qt/qwidget.h>
+#include <Qt/q3table.h>
//Added by qt3to4:
-#include <QResizeEvent>
+#include <QtGui/QResizeEvent>
class QColorGroup;
class QRect;
Index: WindowSystem/QT4/OSGQ4FieldEditorFactory.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldEditorFactory.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldEditorFactory.h
--- WindowSystem/QT4/OSGQ4FieldEditorFactory.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldEditorFactory.h 23 Jan 2010 20:32:04 -0000
@@ -46,7 +46,7 @@
#include <OSGBaseTypes.h>
-#include <qnamespace.h>
+#include <Qt/qnamespace.h>
class QWidget;
Index: WindowSystem/QT4/OSGQ4FieldEditor_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldEditor_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldEditor_qt.cpp
--- WindowSystem/QT4/OSGQ4FieldEditor_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldEditor_qt.cpp 23 Jan 2010 20:32:04 -0000
@@ -40,10 +40,10 @@
#include "OSGQ4FieldView_qt.h"
-#include <qlineedit.h>
-#include <qevent.h>
+#include <Qt/qlineedit.h>
+#include <Qt/qevent.h>
//Added by qt3to4:
-#include <QResizeEvent>
+#include <QtGui/QResizeEvent>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/OSGQ4FieldEditor_qt.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldEditor_qt.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldEditor_qt.h
--- WindowSystem/QT4/OSGQ4FieldEditor_qt.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldEditor_qt.h 23 Jan 2010 20:32:04 -0000
@@ -46,9 +46,9 @@
#include <OSGField.h>
-#include <qwidget.h>
+#include <Qt/qwidget.h>
//Added by qt3to4:
-#include <QResizeEvent>
+#include <QtGui/QResizeEvent>
class QLineEdit;
class QResizeEvent;
Index: WindowSystem/QT4/OSGQ4FieldLabelFactory.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldLabelFactory.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldLabelFactory.h
--- WindowSystem/QT4/OSGQ4FieldLabelFactory.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldLabelFactory.h 23 Jan 2010 20:32:04 -0000
@@ -49,7 +49,7 @@
#include <string>
#include <map>
-#include <qnamespace.h>
+#include <Qt/qnamespace.h>
OSG_BEGIN_NAMESPACE
Index: WindowSystem/QT4/OSGQ4FieldValueLabel.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldValueLabel.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldValueLabel.cpp
--- WindowSystem/QT4/OSGQ4FieldValueLabel.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldValueLabel.cpp 23 Jan 2010 20:32:04 -0000
@@ -39,9 +39,9 @@
#include "OSGQ4FieldValueLabel.h"
#include "OSGQ4FieldView_qt.h"
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qrect.h>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
+#include <QtCore/QRect>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/OSGQ4FieldValueLabel.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldValueLabel.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldValueLabel.h
--- WindowSystem/QT4/OSGQ4FieldValueLabel.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldValueLabel.h 23 Jan 2010 20:32:04 -0000
@@ -48,9 +48,9 @@
#include <OSGVector.h>
#include <OSGFieldContainerPtr.h>
-#include <qnamespace.h>
-#include <qsize.h>
-#include <qstring.h>
+#include <Qt/qnamespace.h>
+#include <Qt/qsize.h>
+#include <Qt/qstring.h>
class QPainter;
class QColorGroup;
Index: WindowSystem/QT4/OSGQ4FieldView_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldView_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldView_qt.cpp
--- WindowSystem/QT4/OSGQ4FieldView_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldView_qt.cpp 23 Jan 2010 20:32:04 -0000
@@ -45,15 +45,15 @@
#include <OSGBaseFunctions.h>
-#include <qpainter.h>
-#include <qscrollbar.h>
-#include <qrect.h>
-#include <qfontmetrics.h>
+#include <Qt/qpainter.h>
+#include <Qt/qscrollbar.h>
+#include <Qt/qrect.h>
+#include <Qt/qfontmetrics.h>
//Added by qt3to4:
-#include <QWheelEvent>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QMouseEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QMouseEvent>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/OSGQ4FieldView_qt.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4FieldView_qt.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4FieldView_qt.h
--- WindowSystem/QT4/OSGQ4FieldView_qt.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4FieldView_qt.h 23 Jan 2010 20:32:04 -0000
@@ -47,14 +47,13 @@
#include <OSGField.h>
#include <OSGFieldContainerPtr.h>
-#include <qwidget.h>
-#include <qevent.h>
-#include <qsizepolicy.h>
-//Added by qt3to4:
-#include <QWheelEvent>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QMouseEvent>
+#include <QtGui/QWidget>
+#include <QtCore/QEvent>
+#include <QtGui/QSizePolicy>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
+#include <QtGui/QMouseEvent>
#include <map>
Index: WindowSystem/QT4/OSGQ4GLManagedWidget_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4GLManagedWidget_qt.cpp,v
retrieving revision 1.2
diff -u -r1.2 OSGQ4GLManagedWidget_qt.cpp
--- WindowSystem/QT4/OSGQ4GLManagedWidget_qt.cpp 16 May 2006 02:40:14 -0000 1.2
+++ WindowSystem/QT4/OSGQ4GLManagedWidget_qt.cpp 23 Jan 2010 20:32:04 -0000
@@ -46,10 +46,10 @@
#include <unistd.h>
//Added by qt3to4:
-#include <QMouseEvent>
-#include <QWheelEvent>
-#include <QKeyEvent>
-#include <QCloseEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QCloseEvent>
#include "OSGConfig.h"
Index: WindowSystem/QT4/OSGQ4GLWidget_qt.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4GLWidget_qt.h,v
retrieving revision 1.2
diff -u -r1.2 OSGQ4GLWidget_qt.h
--- WindowSystem/QT4/OSGQ4GLWidget_qt.h 26 Feb 2007 13:37:38 -0000 1.2
+++ WindowSystem/QT4/OSGQ4GLWidget_qt.h 23 Jan 2010 20:32:04 -0000
@@ -59,7 +59,7 @@
#pragma warning (disable : 171)
#endif
-#include <QGLWidget>
+#include <QtOpenGL/QGLWidget>
#ifdef OSG_WIN32_ICL
#pragma warning (default : 171)
Index: WindowSystem/QT4/OSGQ4MatrixFieldValueLabel.inl
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4MatrixFieldValueLabel.inl,v
retrieving revision 1.2
diff -u -r1.2 OSGQ4MatrixFieldValueLabel.inl
--- WindowSystem/QT4/OSGQ4MatrixFieldValueLabel.inl 26 Feb 2007 13:37:38 -0000 1.2
+++ WindowSystem/QT4/OSGQ4MatrixFieldValueLabel.inl 23 Jan 2010 20:32:05 -0000
@@ -47,9 +47,9 @@
#include <OSGBaseFunctions.h>
#include <OSGMathFieldDataType.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qpalette.h>
+#include <QtCore/QRect>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
OSG_BEGIN_NAMESPACE
Index: WindowSystem/QT4/OSGQ4NodeTreeView_qt.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4NodeTreeView_qt.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4NodeTreeView_qt.h
--- WindowSystem/QT4/OSGQ4NodeTreeView_qt.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4NodeTreeView_qt.h 23 Jan 2010 20:32:05 -0000
@@ -49,7 +49,8 @@
#include <list>
-#include <q3listview.h>
+#include <Qt3Support/Q3ListView>
+#include <Qt3Support/Q3ListViewItem>
OSG_BEGIN_NAMESPACE
@@ -174,13 +175,13 @@
void setSelectedFC(const FieldContainerPtr &pFC );
private:
- typedef Q3ListView Inherited;
+ typedef Q3ListView Inherited;
typedef std::list<FieldContainerPtr> BranchType;
typedef BranchType::iterator BranchTypeIt;
typedef BranchType::const_iterator BranchTypeConstIt;
- void removeChildren ( Q3ListViewItem *pItem );
+ void removeChildren ( Q3ListViewItem *pItem );
void doSelectFC (const FieldContainerPtr &pFC );
@@ -191,7 +192,7 @@
void expandBranch (const BranchType &branch );
Q3ListViewItem *findItemInChildren(const FieldContainerPtr &pFC,
- Q3ListViewItem *pParentItem);
+ Q3ListViewItem *pParentItem);
FieldContainerPtr _pRoot;
UInt32 _uiAspect;
Index: WindowSystem/QT4/OSGQ4PointFieldValueLabel.inl
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4PointFieldValueLabel.inl,v
retrieving revision 1.2
diff -u -r1.2 OSGQ4PointFieldValueLabel.inl
--- WindowSystem/QT4/OSGQ4PointFieldValueLabel.inl 26 Feb 2007 13:37:38 -0000 1.2
+++ WindowSystem/QT4/OSGQ4PointFieldValueLabel.inl 23 Jan 2010 20:32:05 -0000
@@ -45,9 +45,9 @@
#include <OSGMField.h>
#include <OSGBaseTypes.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qpalette.h>
+#include <Qt/qpainter.h>
+#include <Qt/qrect.h>
+#include <Qt/qpalette.h>
OSG_BEGIN_NAMESPACE
Index: WindowSystem/QT4/OSGQ4SceneGraphViewFunctions.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4SceneGraphViewFunctions.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4SceneGraphViewFunctions.cpp
--- WindowSystem/QT4/OSGQ4SceneGraphViewFunctions.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4SceneGraphViewFunctions.cpp 23 Jan 2010 20:32:05 -0000
@@ -43,7 +43,7 @@
#include <OSGLog.h>
#include <OSGThread.h>
-#include <qapplication.h>
+#include <QtGui/QApplication>
OSG_BEGIN_NAMESPACE
Index: WindowSystem/QT4/OSGQ4SceneGraphView_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4SceneGraphView_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4SceneGraphView_qt.cpp
--- WindowSystem/QT4/OSGQ4SceneGraphView_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4SceneGraphView_qt.cpp 23 Jan 2010 20:32:05 -0000
@@ -47,16 +47,15 @@
#include <OSGFieldContainerFactory.h>
#include <OSGThreadManager.h>
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <q3combobox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qstring.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
+#include <QtGui/QSplitter>
+#include <QtGui/QLayout>
+#include <Qt3Support/Q3ComboBox>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QPushButton>
+#include <QtCore/QString>
+#include <Qt3Support/Q3VBoxLayout>
+#include <Qt3Support/Q3HBoxLayout>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/OSGQ4SceneGraphView_qt.h
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4SceneGraphView_qt.h,v
retrieving revision 1.1
diff -u -r1.1 OSGQ4SceneGraphView_qt.h
--- WindowSystem/QT4/OSGQ4SceneGraphView_qt.h 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/OSGQ4SceneGraphView_qt.h 23 Jan 2010 20:32:05 -0000
@@ -46,11 +46,11 @@
#include <OSGNode.h>
-#include <qwidget.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3HBoxLayout>
-#include <QLabel>
+#include <QtCore/QObject>
+#include <QtGui/QWidget>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QLabel>
class Q3HBoxLayout;
class Q3VBoxLayout;
@@ -134,23 +134,23 @@
HistoryListIt _currentHistoryEntry;
bool _bRestoringHistory;
- Q3HBoxLayout *_pGlobalLayout;
+ Q3HBoxLayout *_pGlobalLayout;
QSplitter *_pSplitter;
- Q3VBoxLayout *_pVBoxLeft;
- Q3ComboBox *_pCBAspect;
+ Q3VBoxLayout *_pVBoxLeft;
+ Q3ComboBox *_pCBAspect;
QNodeTreeView **_pTreeView;
QLabel *_pLabelRawAddress;
QLineEdit *_pLERawAddress;
QPushButton *_pPBUpdate;
- Q3HBoxLayout *_pHBoxHistoryButtons;
+ Q3HBoxLayout *_pHBoxHistoryButtons;
QPushButton *_pPBBackward;
QPushButton *_pPBForward;
- Q3VBoxLayout *_pVBoxRight;
+ Q3VBoxLayout *_pVBoxRight;
QFieldContainerView *_pFCView;
- Q3HBoxLayout *_pHBoxFCHeader;
+ Q3HBoxLayout *_pHBoxFCHeader;
QLabel *_pLabelFCName;
QPushButton *_pPBShowTypeColumn;
};
Index: WindowSystem/QT4/OSGQ4VectorFieldValueLabel.inl
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/OSGQ4VectorFieldValueLabel.inl,v
retrieving revision 1.2
diff -u -r1.2 OSGQ4VectorFieldValueLabel.inl
--- WindowSystem/QT4/OSGQ4VectorFieldValueLabel.inl 26 Feb 2007 13:37:38 -0000 1.2
+++ WindowSystem/QT4/OSGQ4VectorFieldValueLabel.inl 23 Jan 2010 20:32:05 -0000
@@ -45,9 +45,9 @@
#include <OSGMField.h>
#include <OSGBaseTypeTraits.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qpalette.h>
+#include <QtGui/QPainter>
+#include <QtCore/QRect>
+#include <QtGui/QPalette>
OSG_BEGIN_NAMESPACE
Index: WindowSystem/QT4/testClusterClientQT4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testClusterClientQT4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testClusterClientQT4.cpp
--- WindowSystem/QT4/testClusterClientQT4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testClusterClientQT4.cpp 23 Jan 2010 20:32:05 -0000
@@ -7,9 +7,9 @@
#include <iostream>
-#include <QApplication>
-#include <QGLWidget>
-#include <QMouseEvent>
+#include <QtGui/QApplication>
+#include <QtOpenGL/QGLWidget>
+#include <QtGui/QMouseEvent>
#if defined(Q_CC_MSVC)
#pragma warning(disable:4305) // init: truncation from const double to float
Index: WindowSystem/QT4/testClusterServerQT4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testClusterServerQT4.cpp,v
retrieving revision 1.2
diff -u -r1.2 testClusterServerQT4.cpp
--- WindowSystem/QT4/testClusterServerQT4.cpp 20 Aug 2007 15:50:42 -0000 1.2
+++ WindowSystem/QT4/testClusterServerQT4.cpp 23 Jan 2010 20:32:05 -0000
@@ -6,10 +6,10 @@
#include <stdlib.h>
#include <string>
-#include <QApplication>
-#include <QGLWidget>
-#include <QMouseEvent>
-#include <QDesktopWidget>
+#include <QtGui/QApplication>
+#include <QtOpenGL/QGLWidget>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QDesktopWidget>
#include <OSGConfig.h>
#include <OSGBaseFunctions.h>
Index: WindowSystem/QT4/testFieldContainerView4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testFieldContainerView4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testFieldContainerView4.cpp
--- WindowSystem/QT4/testFieldContainerView4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testFieldContainerView4.cpp 23 Jan 2010 20:32:05 -0000
@@ -1,6 +1,6 @@
#include "OSGQ4FieldContainerView_qt.h"
-#include <qapplication.h>
+#include <QtGui/QApplication>
#include <OSGSimpleGeometry.h>
Index: WindowSystem/QT4/testFieldView4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testFieldView4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testFieldView4.cpp
--- WindowSystem/QT4/testFieldView4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testFieldView4.cpp 23 Jan 2010 20:32:05 -0000
@@ -1,6 +1,6 @@
#include "OSGQ4FieldView_qt.h"
-#include <qapplication.h>
+#include <QtGui/QApplication>
#include <OSGVec3fFields.h>
Index: WindowSystem/QT4/testManagedWindowQT4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testManagedWindowQT4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testManagedWindowQT4.cpp
--- WindowSystem/QT4/testManagedWindowQT4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testManagedWindowQT4.cpp 23 Jan 2010 20:32:05 -0000
@@ -3,7 +3,7 @@
#pragma set woff 1375
#endif
-#include <qapplication.h>
+#include <QtGui/QApplication>
#ifdef __sgi
#pragma reset woff 1375
Index: WindowSystem/QT4/testNodeTreeView4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testNodeTreeView4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testNodeTreeView4.cpp
--- WindowSystem/QT4/testNodeTreeView4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testNodeTreeView4.cpp 23 Jan 2010 20:32:05 -0000
@@ -8,7 +8,7 @@
#include <string>
-#include <qapplication.h>
+#include <QtGui/QApplication>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/testPassiveMTQT4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testPassiveMTQT4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testPassiveMTQT4.cpp
--- WindowSystem/QT4/testPassiveMTQT4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testPassiveMTQT4.cpp 23 Jan 2010 20:32:05 -0000
@@ -11,9 +11,9 @@
// This code is based on the QT opengl/gear example.
-#include <QApplication>
-#include <QGLWidget>
-#include <QMouseEvent>
+#include <QtGui/QApplication>
+#include <QtOpenGL/QGLWidget>
+#include <QtGui/QMouseEvent>
#include <math.h>
#include <vector>
Index: WindowSystem/QT4/testPassiveQT4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testPassiveQT4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testPassiveQT4.cpp
--- WindowSystem/QT4/testPassiveQT4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testPassiveQT4.cpp 23 Jan 2010 20:32:05 -0000
@@ -13,9 +13,9 @@
#include <math.h>
-#include <QApplication>
-#include <QGLWidget>
-#include <QMouseEvent>
+#include <QtGui/QApplication>
+#include <QtOpenGL/QGLWidget>
+#include <QtGui/QMouseEvent>
#if defined(Q_CC_MSVC)
#pragma warning(disable:4305) // init: truncation from const double to float
Index: WindowSystem/QT4/testSceneGraphView4.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testSceneGraphView4.cpp,v
retrieving revision 1.1
diff -u -r1.1 testSceneGraphView4.cpp
--- WindowSystem/QT4/testSceneGraphView4.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testSceneGraphView4.cpp 23 Jan 2010 20:32:05 -0000
@@ -8,7 +8,7 @@
#include <string>
-#include <QApplication>
+#include <QtGui/QApplication>
OSG_USING_NAMESPACE
Index: WindowSystem/QT4/testWindowMTQT4_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testWindowMTQT4_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 testWindowMTQT4_qt.cpp
--- WindowSystem/QT4/testWindowMTQT4_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testWindowMTQT4_qt.cpp 23 Jan 2010 20:32:05 -0000
@@ -13,9 +13,9 @@
#pragma set woff 1375
#endif
-#include <QApplication>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
#ifdef __sgi
#pragma reset woff 1375
Index: WindowSystem/QT4/testWindowQT4SSM_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testWindowQT4SSM_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 testWindowQT4SSM_qt.cpp
--- WindowSystem/QT4/testWindowQT4SSM_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testWindowQT4SSM_qt.cpp 23 Jan 2010 20:32:05 -0000
@@ -6,9 +6,9 @@
#pragma set woff 1375
#endif
-#include <QApplication>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
#ifdef __sgi
#pragma set woff 1375
Index: WindowSystem/QT4/testWindowQT4_qt.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/WindowSystem/QT4/testWindowQT4_qt.cpp,v
retrieving revision 1.1
diff -u -r1.1 testWindowQT4_qt.cpp
--- WindowSystem/QT4/testWindowQT4_qt.cpp 10 Mar 2006 18:30:35 -0000 1.1
+++ WindowSystem/QT4/testWindowQT4_qt.cpp 23 Jan 2010 20:32:05 -0000
@@ -6,9 +6,9 @@
#pragma set woff 1375
#endif
-#include <QApplication>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
#ifdef __sgi
#pragma set woff 1375
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Opensg-users mailing list
Opensg-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensg-users
