diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /qtbase.pro | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/qtbase.pro b/qtbase.pro index 4c41cfff50..02dc11eac2 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -77,17 +77,14 @@ INSTALLS += qmake #syncqt syncqt.path = $$[QT_HOST_BINS] -syncqt.files = $$PWD/bin/syncqt -equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat +syncqt.files = $$PWD/bin/syncqt.pl INSTALLS += syncqt # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to find the non-installed syncqt. -prefix_build { +prefix_build|!equals(PWD, $$OUT_PWD) { - cmd = $$shell_path($$OUT_PWD/bin/syncqt) - contains(QMAKE_HOST.os, Windows): \ - cmd = $${cmd}.bat + cmd = perl -w $$shell_path($$PWD/bin/syncqt.pl) TOOL_PRI = $$OUT_PWD/mkspecs/modules/qt_tool_syncqt.pri |