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

Fix that changing qmake arguments did not update the import label

Browse Source 
Task-Nr: QTCREATOR-269
This commit is contained in:
dt
2010-01-12 17:20:15 +01:00
parent 45c605217d
commit b560e24034
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -210,8 +210,13 @@ bool QMakeStep::processFinished(int exitCode, QProcess::ExitStatus status)
void QMakeStep::setUserArguments(const QStringList &arguments) void QMakeStep::setUserArguments(const QStringList &arguments)
{ {
if (m_userArgs == arguments)
return;
m_userArgs = arguments; m_userArgs = arguments;
emit userArgumentsChanged(); emit userArgumentsChanged();
qt4BuildConfiguration()->emitQMakeBuildConfigurationChanged();
} }
QStringList QMakeStep::userArguments() QStringList QMakeStep::userArguments()

5
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -316,6 +316,11 @@ void Qt4BuildConfiguration::setQMakeBuildConfiguration(QtVersion::QmakeBuildConf
emit targetInformationChanged(); emit targetInformationChanged();
} }
void Qt4BuildConfiguration::emitQMakeBuildConfigurationChanged()
{
emit qmakeBuildConfigurationChanged();
}
void Qt4BuildConfiguration::getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const void Qt4BuildConfiguration::getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const
{ {
QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion()->defaultBuildConfig(); QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion()->defaultBuildConfig();

3
src/plugins/qt4projectmanager/qt4buildconfiguration.h
View File

@@ -90,6 +90,9 @@ public:
QtVersion::QmakeBuildConfigs qmakeBuildConfiguration() const; QtVersion::QmakeBuildConfigs qmakeBuildConfiguration() const;
void setQMakeBuildConfiguration(QtVersion::QmakeBuildConfigs config); void setQMakeBuildConfiguration(QtVersion::QmakeBuildConfigs config);
// used by qmake step to notify that the qmake args have changed
// not really nice
void emitQMakeBuildConfigurationChanged();
void getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const; void getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const;
// Those functions are used in a few places. // Those functions are used in a few places.