Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployableindex ea08537..84a20d1 100644
- --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
- +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
- @@ -68,7 +68,7 @@ MaemoDeployables::~MaemoDeployables() {}
- void MaemoDeployables::init()
- {
- Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
- - connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- + connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- m_updateTimer, SLOT(start()));
- // TODO do we want to disable the view
- diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfindex 860effb..91d4639 100644
- --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
- +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
- @@ -114,7 +114,7 @@ void S60DeployConfiguration::ctor()
- // requires keeping track of the parsing state of the project
- // connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- // this, SLOT(targetInformationInvalidated()));
- - connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- this, SIGNAL(targetInformationChanged()));
- connect(qt4Target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
- this, SLOT(updateActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
- diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60dindex 2273d81..485d5dc 100644
- --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
- +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
- @@ -76,6 +76,8 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
- connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)),
- this, SLOT(runConfigurationEnabledChange(bool)));
- +
- + setEnabled(m_runConfiguration->isEnabled());
- }
- void S60DeviceRunConfigurationWidget::argumentsEdited(const QString &text)
- diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
- index 6d33a49..e9ce1ef 100644
- --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
- +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
- @@ -179,6 +179,7 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFile
- void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
- {
- + Q_UNUSED(pro);
- handleParseState(false);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement