Advertisement
Guest User

Untitled

a guest
Jun 23rd, 2017
51
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.98 KB | None | 0 0
  1. diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployableindex ea08537..84a20d1 100644
  2. --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
  3. +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
  4. @@ -68,7 +68,7 @@ MaemoDeployables::~MaemoDeployables() {}
  5.  void MaemoDeployables::init()
  6.  {
  7.      Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
  8. -    connect(pro,  SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
  9. +    connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
  10.              m_updateTimer, SLOT(start()));
  11.  
  12.      // TODO do we want to disable the view
  13. diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfindex 860effb..91d4639 100644
  14. --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
  15. +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
  16. @@ -114,7 +114,7 @@ void S60DeployConfiguration::ctor()
  17.      // requires keeping track of the parsing state of the project
  18.  //    connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
  19.  //            this, SLOT(targetInformationInvalidated()));
  20. -    connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
  21. +    connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
  22.              this, SIGNAL(targetInformationChanged()));
  23.      connect(qt4Target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
  24.              this, SLOT(updateActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*)));
  25. diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60dindex 2273d81..485d5dc 100644
  26. --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
  27. +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
  28. @@ -76,6 +76,8 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
  29.  
  30.      connect(m_runConfiguration, SIGNAL(isEnabledChanged(bool)),
  31.              this, SLOT(runConfigurationEnabledChange(bool)));
  32. +
  33. +    setEnabled(m_runConfiguration->isEnabled());
  34.  }
  35.  
  36.  void S60DeviceRunConfigurationWidget::argumentsEdited(const QString &text)
  37. diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
  38. index 6d33a49..e9ce1ef 100644
  39. --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
  40. +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
  41. @@ -179,6 +179,7 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFile
  42.  
  43.  void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
  44.  {
  45. +    Q_UNUSED(pro);
  46.      handleParseState(false);
  47.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement