examples: compile w/o opengl

Fixes remnants of an automated QtGui -> QtWidgets port.

Change-Id: I31f63bdd6ae71aee8e70b20e24def30e0eafb725
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp
index fd41cee..70f0303 100644 (file)
--- 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 e994694..6d9b319 100644 (file)
--- 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 2c1d043..4b9733b 100644 (file)
--- 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 80f966e..0977ea1 100644 (file)
--- 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 8641109..eb63d0c 100644 (file)
--- 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 bd70450..527133e 100644 (file)
--- 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 4d3efe1..4362d28 100644 (file)
--- 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 60a5cd7..916866d 100644 (file)
--- 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