diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /qtbase.pro | |
parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'qtbase.pro')
-rw-r--r-- | qtbase.pro | 23 |
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 = \ |