diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2009-08-10 16:04:59 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:52:55 (GMT) |
| commit | e15e6fd4330c096fb448123712bcbc5f3e4258f3 (patch) | |
| tree | 38f885c66a13beb54ed2ae9f62a72fd0f6bc86d2 | |
| parent | 1590701ed51bf81e6052c9dad28d0c29bf3bb4e1 (diff) | |
| download | Qt-e15e6fd4330c096fb448123712bcbc5f3e4258f3.zip Qt-e15e6fd4330c096fb448123712bcbc5f3e4258f3.tar.gz Qt-e15e6fd4330c096fb448123712bcbc5f3e4258f3.tar.bz2 | |
Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not set
This matches the logic for the 'lib' template to the one for 'app'.
(cherry picked from commit 9e4f5f2133b542cdf6f32f2fc96dccd864e68420)
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 38edbcd..6285548 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -258,7 +258,7 @@ UnixMakefileGenerator::init() bundle += project->first("QMAKE_BUNDLE_EXTENSION"); else if(!bundle.endsWith(".plugin")) bundle += ".plugin"; - if(!project->isEmpty("QMAKE_BUNDLE_LOCATION")) + if(project->isEmpty("QMAKE_BUNDLE_LOCATION")) project->values("QMAKE_BUNDLE_LOCATION").append("Contents/MacOS"); } else { if(!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) |