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/generators/win32/msbuild_objectmodel.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/generators/win32/msbuild_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index b47803a5f4..6ccd58e0de 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -603,8 +603,8 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) xml.setIndentString(" "); - const QString toolsVersion = (tool.SdkVersion == QStringLiteral("10.0")) ? QStringLiteral("14.0") - : QStringLiteral("4.0"); + const QString toolsVersion = (tool.SdkVersion == QLatin1String("10.0")) ? QStringLiteral("14.0") + : QStringLiteral("4.0"); xml << decl("1.0", "utf-8") << tag("Project") |