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/widgets | |
| parent | 86f953a6d40666a3355e76b3ab2c8a2cf5452ec6 (diff) | |
| parent | b652bffea7a0a1bf209c21d9b73f509226f031bd (diff) | |
Merge "Merge branch 'buildsystem'" into refs/staging/master
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets.pro | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 91ac4074e9..94ae7824a3 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -1,24 +1,17 @@ -load(qt_module) +load(qt_build_config) TARGET = QtWidgets -QPRO_PWD = $$PWD -QT = core core-private gui gui-private platformsupport-private +QT = core-private gui-private +MODULE_CONFIG = uic -CONFIG += module -MODULE_PRI = ../modules/qt_widgets.pri - -DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - -HEADERS += $$QT_SOURCE_TREE/src/widgets/qtwidgetsversion.h - QMAKE_DOCS = $$PWD/doc/qtwidgets.qdocconf QMAKE_DOCS_INDEX = ../../doc -include(../qbase.pri) +load(qt_module_config) #platforms mac:include(kernel/mac.pri) @@ -56,3 +49,10 @@ INCLUDEPATH += ../3rdparty/harfbuzz/src win32:!contains(QT_CONFIG, directwrite) { DEFINES += QT_NO_DIRECTWRITE } + +load(uic) + +uic_dir.name = uic_location +uic_dir.variable = QMAKE_UIC + +QMAKE_PKGCONFIG_VARIABLES += uic_dir |