diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2009-08-14 10:50:29 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2009-08-14 10:53:02 (GMT) |
| commit | 51ce8a80acebc67ef09d506d89a2ee1972377877 (patch) | |
| tree | ed99640d0ee8a845f7a8a8af81feea026ce0dc30 /qmake | |
| parent | dc2070d82c3d3cd972a52df680c6df9d2989f3e4 (diff) | |
| download | Qt-51ce8a80acebc67ef09d506d89a2ee1972377877.zip Qt-51ce8a80acebc67ef09d506d89a2ee1972377877.tar.gz Qt-51ce8a80acebc67ef09d506d89a2ee1972377877.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'.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'qmake')
| -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 a2bd71f..36470f2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -261,7 +261,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")) |