diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 13:06:38 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 13:06:38 +0200 |
| commit | 572200989b224ad68e7b8ae4c0aecceb6ca871a2 (patch) | |
| tree | 5591e8e6c17df64674aa79227ad6b70374c169ff /qtbase.pro | |
| parent | 7ed024226faa9c53c6bad96fb6c9f38a22d25751 (diff) | |
| parent | 241eca33ed45f112feed18c6256c31e606f47796 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/features/create_cmake.prf
Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
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) } |