diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-18 10:59:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-05-18 11:17:43 +0200 |
| commit | c50704d6c0ca07cb26942ee938bb875a855dc9bf (patch) | |
| tree | 9337751f2d917628578875bda887cfb015c9748f /mkspecs | |
| parent | 0415df85405432bc4bec98317521c9210303a872 (diff) | |
| download | qt4-tools-c50704d6c0ca07cb26942ee938bb875a855dc9bf.tar.gz | |
fix qmake -project once more
default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a
consequence, the former do not find qtPrepareTool(), as nobody includes
qt_functions.prf if no qmake spec is loaded.
Reviewed-by: joerg
Diffstat (limited to 'mkspecs')
| -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 6442594240..2e82f03eb9 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 5d00a4df4b..a305a4f0eb 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 d108f24f3d..c87372d063 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) |