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/uitools | |
| 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/uitools')
| -rw-r--r-- | examples/uitools/multipleinheritance/calculatorform.cpp | 2 | ||||
| -rw-r--r-- | examples/uitools/multipleinheritance/multipleinheritance.pro | 1 | ||||
| -rw-r--r-- | examples/uitools/textfinder/textfinder.cpp | 2 | ||||
| -rw-r--r-- | examples/uitools/textfinder/textfinder.pro | 1 | ||||
| -rw-r--r-- | examples/uitools/uitools.pro | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/examples/uitools/multipleinheritance/calculatorform.cpp b/examples/uitools/multipleinheritance/calculatorform.cpp index 2963db356a..ae1312f558 100644 --- a/examples/uitools/multipleinheritance/calculatorform.cpp +++ b/examples/uitools/multipleinheritance/calculatorform.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "calculatorform.h" diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro index 4be470bf5f..7e64967416 100644 --- a/examples/uitools/multipleinheritance/multipleinheritance.pro +++ b/examples/uitools/multipleinheritance/multipleinheritance.pro @@ -14,5 +14,6 @@ symbian { TARGET.UID3 = 0xA000D7C1 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp index 0a69d5e2dd..041c36f218 100644 --- a/examples/uitools/textfinder/textfinder.cpp +++ b/examples/uitools/textfinder/textfinder.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QtUiTools> -#include <QtGui> +#include <QtWidgets> #include "textfinder.h" //! [0] diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro index 73a9f5ea1e..337b7216e4 100644 --- a/examples/uitools/textfinder/textfinder.pro +++ b/examples/uitools/textfinder/textfinder.pro @@ -10,6 +10,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/textfinder INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets maemo5: CONFIG += qt_example symbian: warning(This example does not work on Symbian platform) diff --git a/examples/uitools/uitools.pro b/examples/uitools/uitools.pro index 8a99f61855..f17de666fb 100644 --- a/examples/uitools/uitools.pro +++ b/examples/uitools/uitools.pro @@ -10,4 +10,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets maemo5: CONFIG += qt_example |