[gegl-qt] Build: Don't use QtModule/SomeClass style includes



commit d4071b0b6e7028a5f389d9863dcd25ecfcafa94f
Author: Jon Nordby <jononor gmail com>
Date:   Sun Mar 11 15:09:31 2012 +0100

    Build: Don't use QtModule/SomeClass style includes
    
    These fail to pick up the correct version when trying to use Qt in developer-mode
    (headers only exist in Qt build dir), and possibly for any Qt installed
    to a non-standard prefix.
    In addition, some classes have moved in Qt5. Notably QApplication,
    QGraphicsView and QWidget is now in the QtWidget module and not QtGui.

 examples/display-operation/display-operation.cpp   |    2 +-
 .../qwidget-autotransform.cpp                      |    2 +-
 examples/qwidget-basic/qwidget-basic.cpp           |    2 +-
 .../qwidget-transformations.cpp                    |    2 +-
 gegl-qt/internal/nodeviewimplementation.h          |    2 +-
 gegl-qt/nodeviewwidget.cpp                         |    2 +-
 gegl-qt/nodeviewwidget.h                           |    2 +-
 .../test-nodeviewimplementation.pro                |    2 ++
 8 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/examples/display-operation/display-operation.cpp b/examples/display-operation/display-operation.cpp
index 7a1e7a6..046ad39 100644
--- a/examples/display-operation/display-operation.cpp
+++ b/examples/display-operation/display-operation.cpp
@@ -18,7 +18,7 @@
 
 #include <gegl.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtCore>
 
 int main(int argc, char *argv[])
diff --git a/examples/qwidget-autotransform/qwidget-autotransform.cpp b/examples/qwidget-autotransform/qwidget-autotransform.cpp
index 8ad29d9..c4b671e 100644
--- a/examples/qwidget-autotransform/qwidget-autotransform.cpp
+++ b/examples/qwidget-autotransform/qwidget-autotransform.cpp
@@ -19,7 +19,7 @@
 #include <gegl-qt.h>
 #include "autotransform-controls.h"
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtCore>
 
 using namespace GeglQt;
diff --git a/examples/qwidget-basic/qwidget-basic.cpp b/examples/qwidget-basic/qwidget-basic.cpp
index 22cce16..14a59a8 100644
--- a/examples/qwidget-basic/qwidget-basic.cpp
+++ b/examples/qwidget-basic/qwidget-basic.cpp
@@ -18,7 +18,7 @@
 
 #include <gegl-qt.h>
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtCore>
 
 using namespace GeglQt;
diff --git a/examples/qwidget-transformations/qwidget-transformations.cpp b/examples/qwidget-transformations/qwidget-transformations.cpp
index 9d93cc4..cdb7a50 100644
--- a/examples/qwidget-transformations/qwidget-transformations.cpp
+++ b/examples/qwidget-transformations/qwidget-transformations.cpp
@@ -20,7 +20,7 @@
 
 #include "transformation-controls.h"
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QtCore>
 
 int main(int argc, char *argv[])
diff --git a/gegl-qt/internal/nodeviewimplementation.h b/gegl-qt/internal/nodeviewimplementation.h
index 02eaac9..b8e8458 100644
--- a/gegl-qt/internal/nodeviewimplementation.h
+++ b/gegl-qt/internal/nodeviewimplementation.h
@@ -19,7 +19,7 @@
  * Copyright (C) 2011 Jon Nordby <jononor gmail com>
  */
 
-#include <Qt/QtGui>
+#include <QtGui>
 #include <gegl.h>
 
 #include <gegl-qt/nodeviewoptions.h>
diff --git a/gegl-qt/nodeviewwidget.cpp b/gegl-qt/nodeviewwidget.cpp
index 1aca297..967cee1 100644
--- a/gegl-qt/nodeviewwidget.cpp
+++ b/gegl-qt/nodeviewwidget.cpp
@@ -19,7 +19,7 @@
 #include "nodeviewwidget.h"
 #include "internal/nodeviewimplementation.h"
 
-#include <Qt/QtGui>
+#include <QtGui>
 #include <QtDebug>
 
 using namespace GeglQt;
diff --git a/gegl-qt/nodeviewwidget.h b/gegl-qt/nodeviewwidget.h
index d86eeb2..d755dc4 100644
--- a/gegl-qt/nodeviewwidget.h
+++ b/gegl-qt/nodeviewwidget.h
@@ -19,7 +19,7 @@
  * Copyright (C) 2011 Jon Nordby <jononor gmail com>
  */
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <gegl.h>
 
 #include <gegl-qt/nodeviewoptions.h>
diff --git a/tests/test-nodeviewimplementation/test-nodeviewimplementation.pro b/tests/test-nodeviewimplementation/test-nodeviewimplementation.pro
index f19431f..012bf7c 100644
--- a/tests/test-nodeviewimplementation/test-nodeviewimplementation.pro
+++ b/tests/test-nodeviewimplementation/test-nodeviewimplementation.pro
@@ -1,6 +1,8 @@
 include(../../config.pri)
 include(../tests-common.pri)
 
+QT += gui
+
 SOURCES += test-nodeviewimplementation.cpp
 HEADERS += test-nodeviewimplementation.h
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]