diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 14:35:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 16:27:28 +0100 |
| commit | a15c3d086dafea83e4760f0b447be43d26b80697 (patch) | |
| tree | fd224a3f83942ff4c432e1e3a3f8583d14d6a11c /qmake/main.cpp | |
| parent | 87abfd351af6309691d921ca0aef077d74df4732 (diff) | |
| parent | 397061a6a92db9f962360d5db96f69b315f93074 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
src/dbus/qdbusconnection_p.h
src/dbus/qdbusintegrator.cpp
src/dbus/qdbusintegrator_p.h
tests/auto/corelib/io/qdir/qdir.pro
tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
Diffstat (limited to 'qmake/main.cpp')
| -rw-r--r-- | qmake/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index d7f9157bf0..23dbade07f 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -304,8 +304,8 @@ int runQMake(int argc, char **argv) dir = tmp_dir; } #ifdef Q_OS_MAC - if (fi.fileName().endsWith(QStringLiteral(".pbxproj")) - && dir.endsWith(QStringLiteral(".xcodeproj"))) + if (fi.fileName().endsWith(QLatin1String(".pbxproj")) + && dir.endsWith(QLatin1String(".xcodeproj"))) dir += QStringLiteral("/.."); #endif if(!dir.isNull() && dir != ".") |