Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit 16a2ff7253950fe5187c46524df0c4ce6cf618c7
- Author: dt <qtc-committer@nokia.com>
- Date: Wed Oct 27 16:27:22 2010 +0200
- Progress so far
- diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
- index d1e9d5d..e7c9336 100644
- --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
- +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.cpp
- @@ -67,9 +67,12 @@ MaemoDeployables::~MaemoDeployables() {}
- void MaemoDeployables::init()
- {
- - connect(qt4BuildConfiguration()->qt4Target()->qt4Project(),
- - SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- - m_updateTimer, SLOT(start()));
- + Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
- + connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + m_updateTimer, SLOT(start()));
- + connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- + this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
- +
- createModels();
- }
- @@ -88,9 +91,11 @@ void MaemoDeployables::createModels()
- m_proFileOption->properties
- = qt4BuildConfiguration()->qtVersion()->versionInfo();
- m_proFileOption->target_mode = ProFileOption::TARG_UNIX_MODE;
- - disconnect(qt4BuildConfiguration()->qt4Target()->qt4Project(),
- - SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- - m_updateTimer, SLOT(start()));
- + Qt4Project *pro = qt4BuildConfiguration()->qt4Target()->qt4Project();
- + disconnect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + m_updateTimer, SLOT(start()));
- + disconnect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- + this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
- beginResetModel();
- qDeleteAll(m_listModels);
- m_listModels.clear();
- @@ -120,9 +125,10 @@ void MaemoDeployables::createModels()
- }
- endResetModel();
- - connect(qt4BuildConfiguration()->qt4Target()->qt4Project(),
- - SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- - m_updateTimer, SLOT(start()));
- + connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + m_updateTimer, SLOT(start()));
- + connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- + this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
- }
- void MaemoDeployables::createModels(const Qt4ProFileNode *proFileNode)
- diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
- index fcb737c..c4e713a 100644
- --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
- +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
- @@ -97,9 +97,11 @@ void MaemoRunConfiguration::init()
- this, SLOT(handleDeployConfigChanged()));
- handleDeployConfigChanged();
- - connect(qt4Target()->qt4Project(),
- - SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- - this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- + Qt4Project *pro = qt4Target()->qt4Project();
- + connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- + connect(pro, SIGNAL(profFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- + this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- }
- MaemoRunConfiguration::~MaemoRunConfiguration()
- diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
- index cd4a04a..d5514da 100644
- --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
- +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
- @@ -110,6 +110,8 @@ S60DeployConfiguration::S60DeployConfiguration(Target *target, S60DeployConfigur
- void S60DeployConfiguration::ctor()
- {
- setDefaultDisplayName(defaultDisplayName());
- + // TODO ??? why is the deployconfiguration signaling something?
- + // What's the point?
- connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- this, SIGNAL(targetInformationChanged()));
- connect(qt4Target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
- diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
- index 3ffa86e..06d9a9a 100644
- --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
- +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
- @@ -100,8 +100,11 @@ void S60EmulatorRunConfiguration::ctor()
- else
- //: S60 emulator run configuration default display name (no pro-file name)
- setDefaultDisplayName(tr("Run on Symbian Emulator"));
- - connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + Qt4Project *pro = qt4Target()->qt4Project();
- + connect(pro, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- + connect(pro, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- + this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
- }
- diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
- index a2189b4..c55de66 100644
- --- a/src/plugins/qt4projectmanager/qt4nodes.cpp
- +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
- @@ -1243,6 +1243,7 @@ Qt4ProFileNode::Qt4ProFileNode(Qt4Project *project,
- QObject *parent)
- : Qt4PriFileNode(project, this, filePath),
- m_projectType(InvalidProject),
- + m_validParse(false),
- m_readerExact(0),
- m_readerCumulative(0)
- {
- @@ -1309,6 +1310,12 @@ QStringList Qt4ProFileNode::variableValue(const Qt4Variable var) const
- void Qt4ProFileNode::scheduleUpdate()
- {
- + if (m_validParse) {
- + m_validParse = false;
- + foreach (NodesWatcher *watcher, watchers())
- + if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
- + emit qt4Watcher->proFileInvalidated(this);
- + }
- m_project->scheduleAsyncUpdate(this);
- }
- @@ -1323,6 +1330,13 @@ void Qt4ProFileNode::asyncUpdate()
- void Qt4ProFileNode::update()
- {
- + if (m_validParse) {
- + m_validParse = false;
- + foreach (NodesWatcher *watcher, watchers())
- + if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
- + emit qt4Watcher->proFileInvalidated(this);
- + }
- +
- setupReader();
- bool parserError = evaluate();
- applyEvaluate(!parserError, false);
- @@ -1405,6 +1419,9 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async)
- m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
- invalidate();
- }
- + foreach (NodesWatcher *watcher, watchers())
- + if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
- + emit qt4Watcher->proFileUpdated(this, false);
- return;
- }
- @@ -1632,9 +1649,11 @@ void Qt4ProFileNode::applyEvaluate(bool parseResult, bool async)
- createUiCodeModelSupport();
- updateUiFiles();
- + m_validParse = true;
- +
- foreach (NodesWatcher *watcher, watchers())
- if (Qt4NodesWatcher *qt4Watcher = qobject_cast<Qt4NodesWatcher*>(watcher))
- - emit qt4Watcher->proFileUpdated(this);
- + emit qt4Watcher->proFileUpdated(this, parseResult);
- m_project->destroyProFileReader(m_readerExact);
- if (m_readerCumulative)
- diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
- index a616f55..ac55a8e 100644
- --- a/src/plugins/qt4projectmanager/qt4nodes.h
- +++ b/src/plugins/qt4projectmanager/qt4nodes.h
- @@ -319,6 +319,8 @@ private:
- TargetInformation m_qt4targetInformation;
- friend class Qt4NodeHierarchy;
- + bool m_validParse;
- +
- // Async stuff
- QFutureWatcher<bool> m_parseFutureWatcher;
- ProFileReader *m_readerExact;
- @@ -341,7 +343,8 @@ signals:
- const QHash<Qt4Variable, QStringList> &oldValues,
- const QHash<Qt4Variable, QStringList> &newValues);
- - void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode);
- + void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode, bool success);
- + void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *projectNode);
- private:
- // let them emit signals
- diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
- index dff2b74..9d43eed 100644
- --- a/src/plugins/qt4projectmanager/qt4project.cpp
- +++ b/src/plugins/qt4projectmanager/qt4project.cpp
- @@ -337,8 +337,11 @@ bool Qt4Project::fromMap(const QVariantMap &map)
- connect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>)),
- this, SLOT(qtVersionsChanged()));
- - connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *)),
- - this, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *)));
- + connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- + this, SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *, bool)));
- +
- + connect(m_nodesWatcher, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + this, SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- connect(this, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)),
- this, SLOT(activeTargetWasChanged()));
- @@ -618,6 +621,7 @@ void Qt4Project::update()
- if (debug)
- qDebug()<<"Doing sync update";
- m_rootProjectNode->update();
- +
- if (debug)
- qDebug()<<"State is now Base";
- m_asyncUpdateState = Base;
- @@ -627,6 +631,7 @@ void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
- {
- if (m_asyncUpdateState == ShuttingDown)
- return;
- +
- if (debug)
- qDebug()<<"schduleAsyncUpdate (node)";
- Q_ASSERT(m_asyncUpdateState != NoState);
- diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
- index 6b2f7b2..8b4cf9c 100644
- --- a/src/plugins/qt4projectmanager/qt4project.h
- +++ b/src/plugins/qt4projectmanager/qt4project.h
- @@ -193,8 +193,8 @@ public:
- Internal::CentralizedFolderWatcher *centralizedFolderWatcher();
- signals:
- - /// emitted after parse
- - void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
- + void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *node, bool);
- + void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *node);
- void buildDirectoryInitialized();
- public slots:
- diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
- index 433986b..d11800c 100644
- --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
- +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
- @@ -102,7 +102,8 @@ Qt4RunConfiguration::Qt4RunConfiguration(Qt4Target *parent, const QString &proFi
- m_runMode(Gui),
- m_isUsingDyldImageSuffix(false),
- m_userSetWokingDirectory(false),
- - m_baseEnvironmentBase(Qt4RunConfiguration::BuildEnvironmentBase)
- + m_baseEnvironmentBase(Qt4RunConfiguration::BuildEnvironmentBase),
- + m_parseSuccess(true)
- {
- ctor();
- }
- @@ -116,7 +117,8 @@ Qt4RunConfiguration::Qt4RunConfiguration(Qt4Target *parent, Qt4RunConfiguration
- m_userSetWokingDirectory(source->m_userSetWokingDirectory),
- m_userWorkingDirectory(source->m_userWorkingDirectory),
- m_userEnvironmentChanges(source->m_userEnvironmentChanges),
- - m_baseEnvironmentBase(source->m_baseEnvironmentBase)
- + m_baseEnvironmentBase(source->m_baseEnvironmentBase),
- + m_parseSuccess(source->m_parseSuccess)
- {
- ctor();
- }
- @@ -132,6 +134,8 @@ Qt4Target *Qt4RunConfiguration::qt4Target() const
- bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
- {
- + if (!m_parseSuccess)
- + return false;
- Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(configuration);
- QTC_ASSERT(qt4bc, return false);
- @@ -156,21 +160,45 @@ bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configu
- return enabled;
- }
- -void Qt4RunConfiguration::proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
- +void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success)
- {
- - if (m_proFilePath == pro->path())
- + if (m_proFilePath != pro->path())
- + return;
- + qDebug()<<"proFileUpdated"<<success;
- + bool enabled = isEnabled();
- + m_parseSuccess = success;
- + if (enabled != isEnabled()) {
- + qDebug()<<"Emitting isEnabledChanged()"<<!enabled;
- + emit isEnabledChanged(!enabled);
- + }
- + if (success)
- emit effectiveTargetInformationChanged();
- }
- +void Qt4RunConfiguration::proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro)
- +{
- + if (m_proFilePath != pro->path())
- + return;
- + qDebug()<<"proFileInvalidated";
- + bool enabled = isEnabled();
- + m_parseSuccess = false;
- + if (enabled != isEnabled()) {
- + qDebug()<<"Emitting isEnabledChanged()"<<!enabled;
- + emit isEnabledChanged(!enabled);
- + }
- +}
- +
- void Qt4RunConfiguration::ctor()
- {
- setDefaultDisplayName(defaultDisplayName());
- connect(qt4Target(), SIGNAL(environmentChanged()),
- this, SIGNAL(baseEnvironmentChanged()));
- + connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)),
- + this, SLOT(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*,bool)));
- - connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- - this, SLOT(proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- + connect(qt4Target()->qt4Project(), SIGNAL(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)),
- + this, SLOT(proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode*)));
- }
- //////
- @@ -281,6 +309,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
- m_environmentWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- vboxTopLayout->addWidget(m_environmentWidget);
- + setEnabled(m_qt4RunConfiguration->isEnabled());
- +
- connect(m_workingDirectoryEdit, SIGNAL(changed(QString)),
- this, SLOT(workDirectoryEdited()));
- @@ -319,6 +349,9 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
- connect(qt4RunConfiguration, SIGNAL(baseEnvironmentChanged()),
- this, SLOT(baseEnvironmentChanged()));
- +
- + connect(qt4RunConfiguration, SIGNAL(isEnabledChanged(bool)),
- + this, SLOT(runConfigurationEnabledChange(bool)));
- }
- Qt4RunConfigurationWidget::~Qt4RunConfigurationWidget()
- @@ -374,6 +407,11 @@ void Qt4RunConfigurationWidget::userChangesEdited()
- m_ignoreChange = false;
- }
- +void Qt4RunConfigurationWidget::runConfigurationEnabledChange(bool enabled)
- +{
- + setEnabled(enabled);
- +}
- +
- void Qt4RunConfigurationWidget::workDirectoryEdited()
- {
- if (m_ignoreChange)
- diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
- index 0e3850e..c0e3ecd 100644
- --- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
- +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
- @@ -75,6 +75,7 @@ public:
- Qt4Target *qt4Target() const;
- virtual bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const;
- + using ProjectExplorer::LocalApplicationRunConfiguration::isEnabled;
- virtual QWidget *createConfigurationWidget();
- virtual QString executable() const;
- @@ -108,7 +109,8 @@ signals:
- void effectiveTargetInformationChanged();
- private slots:
- - void proFileUpdate(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
- + void proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro, bool success);
- + void proFileInvalidated(Qt4ProjectManager::Internal::Qt4ProFileNode *pro);
- protected:
- Qt4RunConfiguration(Qt4Target *parent, Qt4RunConfiguration *source);
- @@ -146,6 +148,7 @@ private:
- QString m_userWorkingDirectory;
- QList<Utils::EnvironmentItem> m_userEnvironmentChanges;
- BaseEnvironmentBase m_baseEnvironmentBase;
- + bool m_parseSuccess;
- };
- class Qt4RunConfigurationWidget : public QWidget
- @@ -159,7 +162,9 @@ public:
- protected:
- void showEvent(QShowEvent *event);
- void hideEvent(QHideEvent *event);
- +
- private slots:
- + void runConfigurationEnabledChange(bool);
- void workDirectoryEdited();
- void workingDirectoryReseted();
- void argumentsEdited(const QString &arguments);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement