feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix windows build.

Browse Source
This commit is contained in:
con
2009-10-01 09:56:02 +02:00
parent 5f9cb8fe14
commit 4252836b4d
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -43,6 +43,8 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/persistentsettings.h> #include <projectexplorer/persistentsettings.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/persistentsettings.h>
#include <debugger/debuggermanager.h> #include <debugger/debuggermanager.h>
@@ -246,7 +248,8 @@ void S60DeviceRunConfiguration::updateTarget()
// Find out what flags we pass on to qmake, this code is duplicated in the qmake step // Find out what flags we pass on to qmake, this code is duplicated in the qmake step
QtVersion::QmakeBuildConfig defaultBuildConfiguration = qtVersion->defaultBuildConfig(); QtVersion::QmakeBuildConfig defaultBuildConfiguration = qtVersion->defaultBuildConfig();
QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->value(pro->activeBuildConfiguration(), "buildConfiguration").toInt()); QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->activeBuildConfiguration()
->value("buildConfiguration").toInt());
QStringList addedUserConfigArguments; QStringList addedUserConfigArguments;
QStringList removedUserConfigArguments; QStringList removedUserConfigArguments;
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll)) if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))

3
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View File

@@ -124,7 +124,8 @@ void S60EmulatorRunConfiguration::updateTarget()
// Find out what flags we pass on to qmake, this code is duplicated in the qmake step // Find out what flags we pass on to qmake, this code is duplicated in the qmake step
QtVersion::QmakeBuildConfig defaultBuildConfiguration = qtVersion->defaultBuildConfig(); QtVersion::QmakeBuildConfig defaultBuildConfiguration = qtVersion->defaultBuildConfig();
QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->value(pro->activeBuildConfiguration(), "buildConfiguration").toInt()); QtVersion::QmakeBuildConfig projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->activeBuildConfiguration()
->value("buildConfiguration").toInt());
QStringList addedUserConfigArguments; QStringList addedUserConfigArguments;
QStringList removedUserConfigArguments; QStringList removedUserConfigArguments;
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll)) if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))

4
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -481,11 +481,11 @@ QString Qt4Project::makeCommand(BuildConfiguration *configuration) const
QString Qt4Project::defaultMakeTarget(BuildConfiguration *configuration) const QString Qt4Project::defaultMakeTarget(BuildConfiguration *configuration) const
{ {
#ifdef QTCREATOR_WITH_S60 #ifdef QTCREATOR_WITH_S60
ToolChain *tc = toolChain(buildConfiguration); ToolChain *tc = toolChain(configuration);
if (!tc) if (!tc)
return QString::null; return QString::null;
QtVersion::QmakeBuildConfig buildConfig QtVersion::QmakeBuildConfig buildConfig
= QtVersion::QmakeBuildConfig(value(activeBuildConfiguration(), "buildConfiguration").toInt()); = QtVersion::QmakeBuildConfig(activeBuildConfiguration()->value("buildConfiguration").toInt());
if (tc->type() == ToolChain::GCCE) { if (tc->type() == ToolChain::GCCE) {
if (!(buildConfig & QtVersion::DebugBuild)) { if (!(buildConfig & QtVersion::DebugBuild)) {