diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-20 10:34:13 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 12:38:32 +0200 |
| commit | 6d9c545d2b83305c3c30a0e917e6c3a474dfe66a (patch) | |
| tree | 54a003c6db32c85f80c5fbb46dbf9322855966e6 /src/gui/gui.pro | |
| parent | 86f953a6d40666a3355e76b3ab2c8a2cf5452ec6 (diff) | |
| parent | b652bffea7a0a1bf209c21d9b73f509226f031bd (diff) | |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'src/gui/gui.pro')
| -rw-r--r-- | src/gui/gui.pro | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index b1f4a106a4..50dc41b8aa 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -1,15 +1,10 @@ -load(qt_module) +load(qt_build_config) TARGET = QtGui -QPRO_PWD = $$PWD QT = core-private +MODULE_CONFIG = opengl -CONFIG += module -MODULE_PRI = ../modules/qt_gui.pri - -DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE - -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore +DEFINES += QT_NO_USING_NAMESPACE load(qt_module_config) @@ -21,8 +16,6 @@ testcocoon { load(testcocoon) } -HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h - QMAKE_DOCS = $$PWD/doc/qtgui.qdocconf QMAKE_DOCS_INDEX = ../../doc |