summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-07 16:32:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-11 18:00:12 +0100
commitd72e1e371b50572e3115b057916b28051ec65434 (patch)
tree1c98a0acaa4fb3f9e30c614c5b00a0960eb66ab7
parentb9c1593435db3ed44e23c23dc19f22d7a68d7b01 (diff)
create tool pri file for syncqt
so that *really* all non-installed tools are properly registered. if some day we have more build scripts, this code should be centralized in a .prf file. Change-Id: I5b292a4b30199cb59838319f2dc9f88cd54bb57d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--qtbase.pro23
1 files changed, 23 insertions, 0 deletions
diff --git a/qtbase.pro b/qtbase.pro
index e66d9fbb28..4c41cfff50 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -81,6 +81,29 @@ syncqt.files = $$PWD/bin/syncqt
equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat
INSTALLS += syncqt
+# If we are doing a prefix build, create a "module" pri which enables
+# qtPrepareTool() to find the non-installed syncqt.
+prefix_build {
+
+ cmd = $$shell_path($$OUT_PWD/bin/syncqt)
+ contains(QMAKE_HOST.os, Windows): \
+ cmd = $${cmd}.bat
+
+ TOOL_PRI = $$OUT_PWD/mkspecs/modules/qt_tool_syncqt.pri
+
+ TOOL_PRI_CONT = "QT_TOOL.syncqt.command = $$val_escape(cmd)"
+ write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.")
+
+ # Then, inject the new tool into the current cache state
+ !contains(QMAKE_INTERNAL_INCLUDED_FILES, $$TOOL_PRI) { # before the actual include()!
+ added = $$TOOL_PRI
+ cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, added)
+ }
+ include($$TOOL_PRI)
+ cache(QT_TOOL.syncqt.command, transient)
+
+}
+
#mkspecs
mkspecs.path = $$[QT_HOST_DATA]/mkspecs
mkspecs.files = \