diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:13:38 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:13:38 +0200 |
commit | 533820320c30fca6028415321d1a3b937a261088 (patch) | |
tree | 1a0eebcc5f5729f5a9d2f00b080c5fcf1cd15c6f /qtbase.pro | |
parent | 25739bebba0343a8b35775a073c49f0fba080762 (diff) | |
parent | 172fa29dffef0eb55378f62b3ea1c18810639b3f (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I94bb158562ae6b80a87b40139d7302ea7b9b9aa8
Diffstat (limited to 'qtbase.pro')
-rw-r--r-- | qtbase.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtbase.pro b/qtbase.pro index 5bed630ea9..d6726b5e93 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -90,7 +90,7 @@ prefix_build|!equals(PWD, $$OUT_PWD) { TOOL_PRI = $$OUT_PWD/mkspecs/modules/qt_tool_syncqt.pri - TOOL_PRI_CONT = "QT_TOOL.syncqt.command = $$val_escape(cmd)" + TOOL_PRI_CONT = "QT_TOOL.syncqt.binary = $$val_escape(cmd)" write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.") # Then, inject the new tool into the current cache state @@ -99,7 +99,7 @@ prefix_build|!equals(PWD, $$OUT_PWD) { cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, added) } include($$TOOL_PRI) - cache(QT_TOOL.syncqt.command, transient) + cache(QT_TOOL.syncqt.binary, transient) } |