forked from qt-creator/qt-creator
Fix that changing qmake arguments did not update the import label
Task-Nr: QTCREATOR-269
This commit is contained in:
@@ -210,8 +210,13 @@ bool QMakeStep::processFinished(int exitCode, QProcess::ExitStatus status)
|
||||
|
||||
void QMakeStep::setUserArguments(const QStringList &arguments)
|
||||
{
|
||||
if (m_userArgs == arguments)
|
||||
return;
|
||||
m_userArgs = arguments;
|
||||
|
||||
emit userArgumentsChanged();
|
||||
|
||||
qt4BuildConfiguration()->emitQMakeBuildConfigurationChanged();
|
||||
}
|
||||
|
||||
QStringList QMakeStep::userArguments()
|
||||
|
||||
@@ -316,6 +316,11 @@ void Qt4BuildConfiguration::setQMakeBuildConfiguration(QtVersion::QmakeBuildConf
|
||||
emit targetInformationChanged();
|
||||
}
|
||||
|
||||
void Qt4BuildConfiguration::emitQMakeBuildConfigurationChanged()
|
||||
{
|
||||
emit qmakeBuildConfigurationChanged();
|
||||
}
|
||||
|
||||
void Qt4BuildConfiguration::getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const
|
||||
{
|
||||
QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion()->defaultBuildConfig();
|
||||
|
||||
@@ -90,6 +90,9 @@ public:
|
||||
|
||||
QtVersion::QmakeBuildConfigs qmakeBuildConfiguration() const;
|
||||
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;
|
||||
|
||||
// Those functions are used in a few places.
|
||||
|
||||
Reference in New Issue
Block a user