From c50704d6c0ca07cb26942ee938bb875a855dc9bf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 18 May 2010 10:59:48 +0200 Subject: 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 --- mkspecs/features/default_pre.prf | 1 + mkspecs/features/resources.prf | 1 + mkspecs/features/uic.prf | 1 + 3 files changed, 3 insertions(+) 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) -- cgit v0.12