From 3fbc9e658df776ceb5cd90e2d145d30a52dd9aa4 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Sat, 16 Jul 2011 07:13:16 -0500 Subject: Make sure we only run syncqt for the non-buildpass cases In debug_and_release builds, we have three passes, the glue pass, and a pass for each build type. We only need to run syncqt when we are in a glue pass, which is when 'build_pass' is not set. In non-debug_and_release builds, build_pass is never set, so this condition works for all build types, with multiple configurations or not. Change-Id: I191da0df3ad422bb5fb8994391c2b2d2e23efc32 Reviewed-on: http://codereview.qt.nokia.com/1717 Reviewed-by: Qt Sanity Bot Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- mkspecs/features/default_pre.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index ebb94e272e..064d24bfa7 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -2,7 +2,7 @@ load(exclusive_builds) ### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug uic resources $$CONFIG -exists($$_PRO_FILE_PWD_/sync.profile) { +!build_pass:exists($$_PRO_FILE_PWD_/sync.profile) { PRO_BASENAME = $$basename(_PRO_FILE_) # Try to detect proper QTDIR path. We require QTDIR, as syncqt uses that to create qt_module.pri -- cgit v1.2.3 From f3f5dc634612a3fdbecb2118e6fcd5772d9dfc7d Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Tue, 12 Jul 2011 13:19:01 -0500 Subject: Fix non-installed library detection Change-Id: I1eb8337bebb524b9f02aef63cd42efcb4a9211bc Reviewed-on: http://codereview.qt.nokia.com/1759 Reviewed-by: Qt Sanity Bot Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_functions.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 86d80cb239..13dadeb1e9 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -140,7 +140,7 @@ defineTest(qtAddModule) { } isEmpty(LINKAGE) { # Make sure we can link to uninstalled libraries - !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { + !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { QMAKE_LIBDIR *= $$MODULE_LIBS unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" } -- cgit v1.2.3 From 7f1d51a45d41a798041bd13200c2fe1ebac9673d Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Tue, 12 Jul 2011 13:01:03 -0500 Subject: Make sure we qtPrepareTool moc, uic and rcc too Their paths may vary depending on configuration and build/install state going forward. Change-Id: I60c8bcd1dc6c2fb729bf84d211875a3d910d5e4a Reviewed-on: http://codereview.qt.nokia.com/1761 Reviewed-by: Qt Sanity Bot Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_module_config.prf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 8f225fe6ed..7b5b5ad304 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -186,6 +186,9 @@ DEFINES *= QT_USE_QSTRINGBUILDER TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +qtPrepareTool(QMAKE_MOC, moc) +qtPrepareTool(QMAKE_UIC, uic) +qtPrepareTool(QMAKE_RCC, rcc) qtPrepareTool(QMAKE_LUPDATE, lupdate) qtPrepareTool(QMAKE_LRELEASE, lrelease) -- cgit v1.2.3 From 997b2a96c1aec1c7f35cd2228eba907f29a28f25 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Thu, 30 Jun 2011 14:51:16 +1000 Subject: Add rudimentary config.test support when configuring modules. An extra script is added (qtmodule-configtests) which is currently invoked from syncqt (with some derived parameters passed to it). The module can optionally have an entry in the module's sync.profile file in the form of a perl map of "test name" => parameters. Tests can print an advisory message if they fail (e.g. "Install this SDK/dev package"), or abort the syncqt process (e.g. mandatory prereq missing). Also, if the test has a "requires(foo)" line that results in it being skipped, this is also supported. Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6 Reviewed-on: http://codereview.qt.nokia.com/928 Reviewed-by: Qt Sanity Bot Reviewed-by: Sarah Jane Smith Reviewed-by: Marius Storm-Olsen --- mkspecs/features/default_pre.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 064d24bfa7..35a4d3f4a4 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -31,7 +31,7 @@ CONFIG = lex yacc warn_on debug uic resources $$CONFIG qtPrepareTool(QMAKE_SYNCQT, syncqt) - MSG = $$quote($$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_) + MSG = $$quote($$QMAKE_SYNCQT $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$OUT_PWD $$_PRO_FILE_PWD_) !silent:message($$MSG) system($$MSG) { # success! Nothing to do -- cgit v1.2.3 From c8ee59952a050506dfebe939c04af2e67aaee849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 18 Apr 2011 17:20:49 +0200 Subject: Introduced a CONFIG option that enables declarative debug services This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry-picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: If180d2b826879d6d02c7be4d3075917815ccf349 Reviewed-on: http://codereview.qt.nokia.com/2435 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- mkspecs/features/declarative_debug.prf | 1 + 1 file changed, 1 insertion(+) create mode 100644 mkspecs/features/declarative_debug.prf (limited to 'mkspecs') diff --git a/mkspecs/features/declarative_debug.prf b/mkspecs/features/declarative_debug.prf new file mode 100644 index 0000000000..b0248f0ac3 --- /dev/null +++ b/mkspecs/features/declarative_debug.prf @@ -0,0 +1 @@ +contains(QT, declarative):DEFINES += QT_DECLARATIVE_DEBUG -- cgit v1.2.3