diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-03-07 15:37:57 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-03-07 15:59:01 +1000 |
| commit | 1b44661f0cba06eee2cb1e3ae0dd0448b79e6a08 (patch) | |
| tree | 12fff3825561294ebd168cc781f15c11ec90c800 /features | |
| parent | b9a8a95e7b5d6389db8bbdd7f4718b47dde32674 (diff) | |
Fix a race condition when building on Mac
Updating deploy.pri based on Qt's qbase.pri.
Without this logic both Makefile.Release and Makefile.Debug have the
same contents which creates a race condition to create the Headers
symlink in the framework.
This logic ensures there is only 1 set of commands that creates
the symlink.
Diffstat (limited to 'features')
| -rw-r--r-- | features/deploy.pri | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/features/deploy.pri b/features/deploy.pri index 33c6f7c7fe..0f712409ae 100644 --- a/features/deploy.pri +++ b/features/deploy.pri @@ -45,10 +45,17 @@ INSTALLS+=target headers mac:contains(QT_CONFIG,qt_framework) { CONFIG += lib_bundle absolute_library_soname - FRAMEWORK_HEADERS.version = Versions - FRAMEWORK_HEADERS.files = $${PUBLIC_HEADERS} - FRAMEWORK_HEADERS.path = Headers - QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS + + CONFIG(debug, debug|release) { + !build_pass:CONFIG += build_all + } else { #release + !debug_and_release|build_pass { + FRAMEWORK_HEADERS.version = Versions + FRAMEWORK_HEADERS.files = $${PUBLIC_HEADERS} + FRAMEWORK_HEADERS.path = Headers + } + QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS + } } CONFIG+= create_prl |