diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-04-11 14:40:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-16 09:01:32 +0200 |
| commit | 35d0e9b66f1c961ec82d1e4ff975d45a2dd2af4b (patch) | |
| tree | 865dbba9069337f774ac0ee4a4cef8dc5361714a /qmake/generators | |
| parent | 60fbb00d59258d0bad0ecee5aa777be802e428e8 (diff) | |
iOS: Don't mangle QT_ARCH when being more specific about what arch to build
On iOS the compiler expects archs like armv6, armv7, armv7s when passed the
-arch flag, or when the ARCHS Xcode variable is set. Instead of mangling
QT_ARCH, which is used other places and assumed to match the values
provided by the arch.test, we use our own variable.
Change-Id: I05e10be8d69dd4d7cbcef04640fef99f1efb253d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index a09e10c55e..e148448c06 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1409,7 +1409,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) + fixListForOutput("QMAKE_LIBS_PRIVATE"), SettingsAsList, 6) << ";" << "\n"; } - const ProStringList &archs = project->values("QT_ARCH"); + const ProStringList &archs = !project->values("QMAKE_XCODE_ARCHS").isEmpty() ? + project->values("QMAKE_XCODE_ARCHS") : project->values("QT_ARCH"); if (!archs.isEmpty()) t << "\t\t\t\t" << writeSettings("ARCHS", archs) << ";" << "\n"; if (!project->isEmpty("OBJECTS_DIR")) |