diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-14 12:30:01 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-14 12:30:01 (GMT) |
| commit | 8d846a525a67f2b0b680ed836601712a5250ce57 (patch) | |
| tree | 34fef9650992717f5d4274d8c578419ac0475698 /qmake | |
| parent | 4c31f59d45130eae8f140e6d0177a4b227454187 (diff) | |
| parent | b770651f19741907cd415ea9ad6e087cb32cc948 (diff) | |
| download | Qt-8d846a525a67f2b0b680ed836601712a5250ce57.zip Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.gz Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
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")) |