diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-30 02:01:13 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-09-30 18:26:49 +0000 |
| commit | 156e3981db60ce65f941867c0f951e9714e5eabf (patch) | |
| tree | 68c59b6df4bf3a3ab9098eda6928ff86c94a7f3f /mkspecs | |
| parent | 116e7a267e2de116f7245e8f1c06d9a4ab174e26 (diff) | |
Reorder arguments to qmake self-invocation in xcodebuild.prf
26d44fce3dfb9dbd3b5be2a031fff8c1bb903960 added support for passing the
configure options to qmake following a "--" argument. This interacted
badly with xcodebuild.prf as the "args" variable would contain the
standard qmake arguments AND the extra arguments following "--"... which
were placed prior to -spec macx-xcode and the path of the .pro file,
causing them to be ignored and thus qmake to print its usage when
attempting to generate Xcode projects for Qt apps on UIKit platforms.
Amends 6a9f38a11d56bb3ba6ec59955f3220627c0d30b6, which fixed the same
issue inside qmake itself.
Change-Id: I3056bd811c2ce958952fec8e05ddef7a063c0646
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/uikit/xcodebuild.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/uikit/xcodebuild.prf b/mkspecs/features/uikit/xcodebuild.prf index 82bcd9a315..c2090a31aa 100644 --- a/mkspecs/features/uikit/xcodebuild.prf +++ b/mkspecs/features/uikit/xcodebuild.prf @@ -21,7 +21,7 @@ args = for(arg, QMAKE_ARGS): \ args += $$system_quote($$arg) -cmd = "$$QMAKE_QMAKE $$args $$system_quote($$_PRO_FILE_) -spec macx-xcode" +cmd = "$$QMAKE_QMAKE $$system_quote($$_PRO_FILE_) -spec macx-xcode $$args" debug(1, "Generating Xcode project in $$OUT_PWD using '$$cmd'") system("cd $$system_quote($$OUT_PWD) && $$cmd") |