Change includes in Quarter to be compatible with Qt5.

This change is Qt4/Qt5 neutral.
2015-12-24 07:32:29 +01:00 · 2015-12-24 07:32:29 +01:00 · 0aa944a1b7
commit 0aa944a1b7
parent ab26271756
5 changed files with 7 additions and 6 deletions
--- a/src/Gui/Quarter/ContextMenu.cpp
+++ b/src/Gui/Quarter/ContextMenu.cpp
@ -33,7 +33,7 @@

 #include "ContextMenu.h"

-#include <QtGui/QMenu>
+#include <QMenu>

 #include <Inventor/SoEventManager.h>
 #include <Inventor/scxml/SoScXMLStateMachine.h>
--- a/src/Gui/Quarter/DragDropHandler.cpp
+++ b/src/Gui/Quarter/DragDropHandler.cpp
@ -44,6 +44,7 @@
 #include <QtCore/QStringList>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDropEvent>
+#include <QMimeData>

 #include <Inventor/SoInput.h>
 #include <Inventor/nodes/SoSeparator.h>
--- a/src/Gui/Quarter/QuarterWidget.cpp
+++ b/src/Gui/Quarter/QuarterWidget.cpp
@ -57,7 +57,7 @@
 #include <QtCore/QEvent>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
-#include <QtGui/QAction>
+#include <QAction>
 #include <QPaintEvent>
 #include <QResizeEvent>

--- a/src/Gui/Quarter/QuarterWidgetP.cpp
+++ b/src/Gui/Quarter/QuarterWidgetP.cpp
@ -38,9 +38,9 @@
 #pragma warning(disable : 4267)
 #endif

-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtGui/QCursor>
-#include <QtGui/QMenu>
+#include <QMenu>
 #include <QtCore/QMap>

 #include <Inventor/nodes/SoCamera.h>
--- a/src/Gui/Quarter/SpaceNavigatorDevice.cpp
+++ b/src/Gui/Quarter/SpaceNavigatorDevice.cpp
@ -36,8 +36,8 @@

 #include <Quarter/devices/SpaceNavigatorDevice.h>

-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
+#include <QApplication>
+#include <QWidget>
 #include <QtCore/QEvent>

 #include <Inventor/events/SoEvent.h>