diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-25 09:15:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-25 09:15:14 +0200 |
| commit | 4d778f7976417a94d25a4bbcbcfa3955e4ded97a (patch) | |
| tree | 787f8007fb932ce56bb83d43802bc8e013cd7265 | |
| parent | 43b9a99983e19302d47c938c1cf936c80b8cb337 (diff) | |
Examples: Fix compilation.
| -rw-r--r-- | examples/examples.pro | 4 | ||||
| -rw-r--r-- | examples/opengl/cube/cube.pro | 2 | ||||
| -rw-r--r-- | examples/opengl/cube/main.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/orientation/main.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/orientation/orientation.pro | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index b10ff590b0..c5a5ada0a6 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -46,10 +46,6 @@ symbian: SUBDIRS = \ gestures \ xml -!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, multimedia) { - SUBDIRS += multimedia -} - qpa:SUBDIRS += qpa embedded:SUBDIRS += qws contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro index 64f6973c00..fd6e288013 100644 --- a/examples/opengl/cube/cube.pro +++ b/examples/opengl/cube/cube.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui +QT += core gui widgets TARGET = cube TEMPLATE = app diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp index faac8a0bd8..e5b99e77e7 100644 --- a/examples/opengl/cube/main.cpp +++ b/examples/opengl/cube/main.cpp @@ -1,4 +1,4 @@ -#include <QtGui/QApplication> +#include <QApplication> #include <QLabel> #ifndef QT_NO_OPENGL diff --git a/examples/widgets/orientation/main.cpp b/examples/widgets/orientation/main.cpp index 34b05d6a66..afaf211b24 100644 --- a/examples/widgets/orientation/main.cpp +++ b/examples/widgets/orientation/main.cpp @@ -1,4 +1,4 @@ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "mainwindow.h" //! [0] diff --git a/examples/widgets/orientation/orientation.pro b/examples/widgets/orientation/orientation.pro index c146322635..cf443b5c0a 100644 --- a/examples/widgets/orientation/orientation.pro +++ b/examples/widgets/orientation/orientation.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui +QT += core gui widgets TARGET = orientation TEMPLATE = app |