diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-09-04 07:26:23 -0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2013-09-04 17:13:07 +0200 |
| commit | 679ec570fafcc4d5903b53c92b67af57fd4de46e (patch) | |
| tree | 140a79a0fbdf08e33e3c6ac5e9a39e298ff903da /src/app | |
| parent | 694c3cc68b97714c14a0aebe53bfd94b7968c977 (diff) | |
Set compiler flags for using a libc++ build of Qt.
Task-number: QBS-194
Change-Id: Ic74aa7d53df0ff25bbaf8ce4d599adbe00dbbba4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index b1c04b33d..e59bf92dc 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -257,6 +257,10 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath) qtEnvironment.buildVariant << QLatin1String("debug"); } + // determine whether user apps require C++11 + if (qtEnvironment.qtConfigItems.contains("c++11") && qtEnvironment.staticBuild) + qtEnvironment.configItems.append("c++11"); + if (!QFileInfo(qtEnvironment.mkspecPath).exists()) throw ErrorInfo(tr("mkspec '%1' does not exist").arg(qtEnvironment.mkspecPath)); @@ -332,6 +336,9 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen if (osxVersion.isEmpty()) throw ErrorInfo(tr("error reading qconfig.h; could not determine whether Qt is using Cocoa or Carbon")); } + + if (qtEnvironment.configItems.contains("c++11")) + osxVersion = QLatin1String("10.7"); } if (qtEnvironment.mkspecPath.contains("ios") && qtEnvironment.qtMajorVersion >= 5) |