Merge commit 'origin/master'

2009-03-20 12:16:41 +01:00
parent b9b262f1d2 361a70ab0e
commit 4829418bb5
70 changed files with 1871 additions and 339 deletions
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -344,11 +344,8 @@ void Qt4RunConfiguration::updateTarget()

 #if defined (Q_OS_MAC)
    if (reader->values("CONFIG").contains("app_bundle")) {
-        QString qmakeBuildConfig = "release";
-        if (projectBuildConfiguration & QtVersion::DebugBuild)
-            qmakeBuildConfig = "debug";
        m_workingDir += QLatin1Char('/')
-                   + qmakeBuildConfig
+                   + reader->value("TARGET")
                   + QLatin1String(".app/Contents/MacOS");
    }
 #endif