diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 03:55:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 03:55:52 (GMT) |
| commit | 06e41bbae1b6ab7fa9ed4fdec1b0c8cc1817bf30 (patch) | |
| tree | dce6a6609bc3f549eb34d672cbc8ae313066a9e9 | |
| parent | dcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3 (diff) | |
| parent | c50704d6c0ca07cb26942ee938bb875a855dc9bf (diff) | |
| download | Qt-06e41bbae1b6ab7fa9ed4fdec1b0c8cc1817bf30.zip Qt-06e41bbae1b6ab7fa9ed4fdec1b0c8cc1817bf30.tar.gz Qt-06e41bbae1b6ab7fa9ed4fdec1b0c8cc1817bf30.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix qmake -project once more
| -rw-r--r-- | mkspecs/features/default_pre.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/resources.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 6442594..2e82f03 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -1,2 +1,3 @@ load(exclusive_builds) +### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug uic resources $$CONFIG diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 5d00a4d..a305a4f 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -1,3 +1,4 @@ +defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf qtPrepareTool(QMAKE_RCC, rcc) isEmpty(RCC_DIR):RCC_DIR = . diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index d108f24..c87372d 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,3 +1,4 @@ +defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf qtPrepareTool(QMAKE_UIC3, uic3) qtPrepareTool(QMAKE_UIC, uic) |