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/opengl/opengl.pro | |
| 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/opengl/opengl.pro')
| -rw-r--r-- | examples/opengl/opengl.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 2a96807102..5502ee270a 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -22,6 +22,11 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ textures } +qpa { + SUBDIRS += hellowindow + SUBDIRS += paintedwindow +} + # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README @@ -29,4 +34,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl INSTALLS += target sources symbian: CONFIG += qt_example +QT += widgets maemo5: CONFIG += qt_example |