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/tools/undoframework | |
| 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/tools/undoframework')
| -rw-r--r-- | examples/tools/undoframework/commands.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/undoframework/diagramitem.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/undoframework/diagramscene.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/undoframework/main.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/undoframework/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/undoframework/undoframework.pro | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/examples/tools/undoframework/commands.cpp b/examples/tools/undoframework/commands.cpp index ff7b0b7f1d..03f8b98d74 100644 --- a/examples/tools/undoframework/commands.cpp +++ b/examples/tools/undoframework/commands.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "commands.h" #include "diagramitem.h" diff --git a/examples/tools/undoframework/diagramitem.cpp b/examples/tools/undoframework/diagramitem.cpp index 3e896f3926..815c8dd69e 100644 --- a/examples/tools/undoframework/diagramitem.cpp +++ b/examples/tools/undoframework/diagramitem.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "diagramitem.h" diff --git a/examples/tools/undoframework/diagramscene.cpp b/examples/tools/undoframework/diagramscene.cpp index 7ffd2db3ac..c60ccc915b 100644 --- a/examples/tools/undoframework/diagramscene.cpp +++ b/examples/tools/undoframework/diagramscene.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "diagramscene.h" #include "diagramitem.h" diff --git a/examples/tools/undoframework/main.cpp b/examples/tools/undoframework/main.cpp index abfa0aa462..385311cb1d 100644 --- a/examples/tools/undoframework/main.cpp +++ b/examples/tools/undoframework/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" diff --git a/examples/tools/undoframework/mainwindow.cpp b/examples/tools/undoframework/mainwindow.cpp index 72c9cc14f4..52a2cffac3 100644 --- a/examples/tools/undoframework/mainwindow.cpp +++ b/examples/tools/undoframework/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" #include "diagramscene.h" diff --git a/examples/tools/undoframework/undoframework.pro b/examples/tools/undoframework/undoframework.pro index f8f127c8ce..a356ce935e 100644 --- a/examples/tools/undoframework/undoframework.pro +++ b/examples/tools/undoframework/undoframework.pro @@ -16,6 +16,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undoframework INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets maemo5: CONFIG += qt_example symbian: warning(This example might not fully work on Symbian platform) |