diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-10-11 15:50:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-14 12:07:53 +0200 |
| commit | d004af667d76d43a346dab502c5ccedeafecc29d (patch) | |
| tree | ab928454816d8ec22076532bb317c812a1f2e037 /mkspecs/macx-xcode | |
| parent | c81d261080c1814bdda945535cf591ae69d48912 (diff) | |
macx-xcode: Change wrapper to write to QMAKESPEC to change mkspec
The allows us to remove the custom logic in default_post for finding
the plist files, and also fixes issues when the wrapped mkspec had
its own feature files.
Change-Id: I4c26cf6a7809f527e170c51c57f59aaf6088774c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/macx-xcode')
| -rw-r--r-- | mkspecs/macx-xcode/features/default_post.prf | 7 | ||||
| -rw-r--r-- | mkspecs/macx-xcode/qmake.conf | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/mkspecs/macx-xcode/features/default_post.prf b/mkspecs/macx-xcode/features/default_post.prf deleted file mode 100644 index 4c4746bb2b..0000000000 --- a/mkspecs/macx-xcode/features/default_post.prf +++ /dev/null @@ -1,7 +0,0 @@ - -isEmpty(QMAKE_INFO_PLIST) { - plist_template = $$absolute_path(../../$$[QMAKE_XSPEC]/Info.plist.$${TEMPLATE}) - exists($$plist_template): QMAKE_INFO_PLIST = $$plist_template -} - -load(default_post) diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index bfc1c58935..fde682b64b 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -4,6 +4,12 @@ # OS X + Xcode # -include(../$$[QMAKE_XSPEC]/qmake.conf) +QMAKESPEC = $$dirname(PWD)/$$[QMAKE_XSPEC] + +include($$QMAKESPEC/qmake.conf) MAKEFILE_GENERATOR = XCODE + +# The active spec is now the original spec, but we still want +# Xcode specific blocks to be triggered. +CONFIG += macx-xcode |