diff options
| -rw-r--r-- | examples/animation/sub-attaq/mainwindow.cpp | 12 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/sub-attaq.pro | 3 | ||||
| -rw-r--r-- | examples/graphicsview/padnavigator/padnavigator.pro | 3 | ||||
| -rw-r--r-- | examples/painting/affine/affine.pro | 3 | ||||
| -rw-r--r-- | examples/painting/composition/composition.pro | 3 | ||||
| -rw-r--r-- | examples/painting/deform/deform.pro | 3 | ||||
| -rw-r--r-- | examples/painting/gradients/gradients.pro | 3 | ||||
| -rw-r--r-- | examples/painting/pathstroke/pathstroke.pro | 3 |
8 files changed, 20 insertions, 13 deletions
diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp index fd41cee6dc..70f0303177 100644 --- a/examples/animation/sub-attaq/mainwindow.cpp +++ b/examples/animation/sub-attaq/mainwindow.cpp @@ -45,13 +45,13 @@ //Qt #include <QGraphicsView> +#include <QApplication> +#include <QMenu> +#include <QMenuBar> +#include <QLayout> -#ifdef QT_NO_OPENGL - #include <QtGui/QMenuBar> - #include <QtGui/QLayout> - #include <QtGui/QApplication> -#else - #include <QtOpenGL/QtOpenGL> +#ifndef QT_NO_OPENGL +# include <QtOpenGL/QtOpenGL> #endif MainWindow::MainWindow() : QMainWindow(0) diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro index e994694b54..6d9b3195ac 100644 --- a/examples/animation/sub-attaq/sub-attaq.pro +++ b/examples/animation/sub-attaq/sub-attaq.pro @@ -1,4 +1,5 @@ -contains(QT_CONFIG, opengl):QT += opengl widgets +QT += widgets +contains(QT_CONFIG, opengl):QT += opengl HEADERS += boat.h \ bomb.h \ mainwindow.h \ diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro index 2c1d043a92..4b9733bb9b 100644 --- a/examples/graphicsview/padnavigator/padnavigator.pro +++ b/examples/graphicsview/padnavigator/padnavigator.pro @@ -16,7 +16,8 @@ RESOURCES += \ FORMS += \ form.ui -contains(QT_CONFIG, opengl):QT += opengl widgets +QT += widgets +contains(QT_CONFIG, opengl):QT += opengl # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator diff --git a/examples/painting/affine/affine.pro b/examples/painting/affine/affine.pro index 80f966e59d..0977ea1c5b 100644 --- a/examples/painting/affine/affine.pro +++ b/examples/painting/affine/affine.pro @@ -3,8 +3,9 @@ HEADERS += xform.h contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl widgets + QT += opengl } +QT += widgets SHARED_FOLDER = ../shared diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro index 8641109cc0..eb63d0c47a 100644 --- a/examples/painting/composition/composition.pro +++ b/examples/painting/composition/composition.pro @@ -8,8 +8,9 @@ include($$SHARED_FOLDER/shared.pri) RESOURCES += composition.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl widgets + QT += opengl } +QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition diff --git a/examples/painting/deform/deform.pro b/examples/painting/deform/deform.pro index bd704507c5..527133e7e5 100644 --- a/examples/painting/deform/deform.pro +++ b/examples/painting/deform/deform.pro @@ -9,8 +9,9 @@ RESOURCES += deform.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl widgets + QT += opengl } +QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform diff --git a/examples/painting/gradients/gradients.pro b/examples/painting/gradients/gradients.pro index 4d3efe1255..4362d283ee 100644 --- a/examples/painting/gradients/gradients.pro +++ b/examples/painting/gradients/gradients.pro @@ -8,8 +8,9 @@ include($$SHARED_FOLDER/shared.pri) RESOURCES += gradients.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl widgets + QT += opengl } +QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro index 60a5cd75ca..916866d1f2 100644 --- a/examples/painting/pathstroke/pathstroke.pro +++ b/examples/painting/pathstroke/pathstroke.pro @@ -9,8 +9,9 @@ RESOURCES += pathstroke.qrc contains(QT_CONFIG, opengl) { DEFINES += QT_OPENGL_SUPPORT - QT += opengl widgets + QT += opengl } +QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke |