summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@nokia.com>2009-08-10 16:04:59 (GMT)
committerTor Arne Vestbø <tor.arne.vestbo@nokia.com>2009-09-24 14:47:57 (GMT)
commit9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (patch)
tree7762703eb5abc552e411f739b3284dc2651e821e
parentd04c169e424c0feee61763764e841ef132ba359f (diff)
downloadQt-9e4f5f2133b542cdf6f32f2fc96dccd864e68420.zip
Qt-9e4f5f2133b542cdf6f32f2fc96dccd864e68420.tar.gz
Qt-9e4f5f2133b542cdf6f32f2fc96dccd864e68420.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'.
-rw-r--r--qmake/generators/unix/unixmake.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 7c62e19..e99ed52 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"))