diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /examples/gestures | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'examples/gestures')
| -rw-r--r-- | examples/gestures/gestures.pro | 1 | ||||
| -rw-r--r-- | examples/gestures/imagegestures/imagegestures.pro | 1 | ||||
| -rw-r--r-- | examples/gestures/imagegestures/imagewidget.cpp | 2 | ||||
| -rw-r--r-- | examples/gestures/imagegestures/imagewidget.h | 2 | ||||
| -rw-r--r-- | examples/gestures/imagegestures/main.cpp | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro index 1e9e2270f3..b354ec4645 100644 --- a/examples/gestures/gestures.pro +++ b/examples/gestures/gestures.pro @@ -8,3 +8,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS gestures.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures INSTALLS += target sources +QT += widgets diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/gestures/imagegestures/imagegestures.pro index 64810b0aeb..03fd2e8ff3 100644 --- a/examples/gestures/imagegestures/imagegestures.pro +++ b/examples/gestures/imagegestures/imagegestures.pro @@ -19,6 +19,7 @@ symbian { TARGET.UID3 = 0xA000D7D0 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example symbian: warning(This example does not work on Symbian platform) maemo5: warning(This example does not work on Maemo platform) diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp index 8bbb96563e..e12cb41363 100644 --- a/examples/gestures/imagegestures/imagewidget.cpp +++ b/examples/gestures/imagegestures/imagewidget.cpp @@ -41,7 +41,7 @@ #include "imagewidget.h" -#include <QtGui> +#include <QtWidgets> //! [constructor] ImageWidget::ImageWidget(QWidget *parent) diff --git a/examples/gestures/imagegestures/imagewidget.h b/examples/gestures/imagegestures/imagewidget.h index fff24fbcdf..1ee7d02224 100644 --- a/examples/gestures/imagegestures/imagewidget.h +++ b/examples/gestures/imagegestures/imagewidget.h @@ -43,7 +43,7 @@ #include <QWidget> #include <QImage> -#include <QtGui> +#include <QtWidgets> QT_BEGIN_NAMESPACE class QGestureEvent; diff --git a/examples/gestures/imagegestures/main.cpp b/examples/gestures/imagegestures/main.cpp index ca37a733f7..4097a2fb31 100644 --- a/examples/gestures/imagegestures/main.cpp +++ b/examples/gestures/imagegestures/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwidget.h" |