diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-28 08:56:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-28 08:58:49 +0200 |
commit | be35b70ca1bf61d022f7dee9df4aaccbf715b25e (patch) | |
tree | dd59ae3713b2bc516101f921491292a8b2c295e3 /qtbase.pro | |
parent | cc54161abb977751b4499c559fc0f464b9e2399e (diff) | |
parent | 572200989b224ad68e7b8ae4c0aecceb6ca871a2 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 35fc764825..d3b03d1fba 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) } |