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

Maemo: No packaging file watchers for non-Maemo projects.

Browse Source
This commit is contained in:
ck
2010-08-05 11:33:39 +02:00
parent 9d712dee79
commit 6c009f19cd
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
View File

@@ -86,9 +86,9 @@ void MaemoTemplatesManager::handleActiveProjectChanged(ProjectExplorer::Project
{ {
if (m_activeProject) if (m_activeProject)
disconnect(m_activeProject, 0, this, 0); disconnect(m_activeProject, 0, this, 0);
m_activeProject = project;
delete m_fsWatcher; delete m_fsWatcher;
m_fsWatcher = 0; m_fsWatcher = 0;
m_activeProject= project;
if (m_activeProject) { if (m_activeProject) {
connect(m_activeProject, SIGNAL(addedTarget(ProjectExplorer::Target*)), connect(m_activeProject, SIGNAL(addedTarget(ProjectExplorer::Target*)),
this, SLOT(createTemplatesIfNecessary(ProjectExplorer::Target*))); this, SLOT(createTemplatesIfNecessary(ProjectExplorer::Target*)));
@@ -98,17 +98,6 @@ void MaemoTemplatesManager::handleActiveProjectChanged(ProjectExplorer::Project
const QList<Target *> &targets = m_activeProject->targets(); const QList<Target *> &targets = m_activeProject->targets();
foreach (Target * const target, targets) foreach (Target * const target, targets)
createTemplatesIfNecessary(target); createTemplatesIfNecessary(target);
m_fsWatcher = new QFileSystemWatcher(this);
m_fsWatcher->addPath(debianDirPath(m_activeProject));
m_fsWatcher->addPath(changeLogFilePath(m_activeProject));
m_fsWatcher->addPath(controlFilePath(m_activeProject));
connect(m_fsWatcher, SIGNAL(directoryChanged(QString)), this,
SLOT(handleDebianDirContentsChanged()));
connect(m_fsWatcher, SIGNAL(fileChanged(QString)), this,
SLOT(handleDebianFileChanged(QString)));
handleDebianDirContentsChanged();
handleDebianFileChanged(changeLogFilePath(m_activeProject));
handleDebianFileChanged(controlFilePath(m_activeProject));
} }
} }
@@ -203,6 +192,18 @@ void MaemoTemplatesManager::createTemplatesIfNecessary(ProjectExplorer::Target *
.arg(QDir::toNativeSeparators(rulesFilePath))); .arg(QDir::toNativeSeparators(rulesFilePath)));
return; return;
} }
m_fsWatcher = new QFileSystemWatcher(this);
m_fsWatcher->addPath(debianDirPath(m_activeProject));
m_fsWatcher->addPath(changeLogFilePath(m_activeProject));
m_fsWatcher->addPath(controlFilePath(m_activeProject));
connect(m_fsWatcher, SIGNAL(directoryChanged(QString)), this,
SLOT(handleDebianDirContentsChanged()));
connect(m_fsWatcher, SIGNAL(fileChanged(QString)), this,
SLOT(handleDebianFileChanged(QString)));
handleDebianDirContentsChanged();
handleDebianFileChanged(changeLogFilePath(m_activeProject));
handleDebianFileChanged(controlFilePath(m_activeProject));
} }
QString MaemoTemplatesManager::version(const Project *project, QString MaemoTemplatesManager::version(const Project *project,