diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 16:20:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-27 13:54:35 +0200 |
| commit | 4dd8a63fc13cee365c58ef67fa4a4503aeceebe8 (patch) | |
| tree | c34de00e0bceeb70ed006e06a7fefc21537c72a1 /qtbase.pro | |
| parent | 5757b8c516ad0d613739b222687583bca914a981 (diff) | |
| parent | fae33bfbe35f8d082b420ee09662ff60634cb355 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Conflicts:
src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
Manually fixed src/testlib/qtestcase.cpp to return the right type.
Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtbase.pro b/qtbase.pro index 51e8fb8760..24d0f5287b 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -49,7 +49,7 @@ INSTALLS += qmake #licheck licheck.path = $$[QT_HOST_BINS] licheck.files = $$PWD/bin/$$QT_LICHECK -exists($$licheck.files): INSTALLS += licheck +!isEmpty(QT_LICHECK): INSTALLS += licheck #syncqt syncqt.path = $$[QT_HOST_BINS] |