diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-23 04:34:34 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-28 04:10:07 +0000 |
| commit | f151e663ad2fcb554f1c8737724080c757f6108e (patch) | |
| tree | 9e467574020e57b9e776a667c4e9e75218822342 | |
| parent | d0e244b3d6ecfc8a7a9cf521896823db3d7945d5 (diff) | |
| download | qbs-f151e663ad2fcb554f1c8737724080c757f6108e.tar.gz | |
Fix MSVC 2012 build.
Change-Id: I7a8059b6a73950405fd4756b9dc2240c2722aaa8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/app/qbs-setup-android/android-setup.cpp | 16 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.h | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index b6765606b..780fca494 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -113,14 +113,14 @@ static QString detectPlatform(const QString &sdkDir) static QStringList expectedArchs() { - return QStringList({ - QStringLiteral("arm64"), - QStringLiteral("armv5"), - QStringLiteral("armv7"), - QStringLiteral("mipsel"), - QStringLiteral("mips64el"), - QStringLiteral("x86"), - QStringLiteral("x86_64")}); + return QStringList() + << QStringLiteral("arm64") + << QStringLiteral("armv5") + << QStringLiteral("armv7") + << QStringLiteral("mipsel") + << QStringLiteral("mips64el") + << QStringLiteral("x86") + << QStringLiteral("x86_64"); } diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h index 27fe83203..060335955 100644 --- a/src/lib/corelib/language/moduleloader.h +++ b/src/lib/corelib/language/moduleloader.h @@ -156,7 +156,9 @@ private: struct ProductModuleInfo { - Item *exportItem = 0; + ProductModuleInfo() : exportItem() {} + + Item *exportItem; QList<ModuleLoaderResult::ProductInfo::Dependency> productDependencies; }; diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index cd7d2a897..2d136090e 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1546,7 +1546,7 @@ static QProcessEnvironment processEnvironmentWithCurrentDirectoryInLibraryPath() { QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert(HostOsInfo::libraryPathEnvironmentVariable(), - QStringList({env.value(HostOsInfo::libraryPathEnvironmentVariable()), "."}) + (QStringList() << env.value(HostOsInfo::libraryPathEnvironmentVariable()) << ".") .join(HostOsInfo::pathListSeparator())); return env; } |