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

Merge remote branch 'origin/2.1'

Browse Source
This commit is contained in:
Friedemann Kleint
2010-10-27 11:05:31 +02:00
parent fe72f7c2f9 5a5ba58dc9
commit 54569c0624
40 changed files with 26000 additions and 7598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -599,12 +599,9 @@ void Qt4Project::updateQmlJSCodeModel()
projectInfo.importPaths += qtVersionImportPath;
}
}
QmlDumpTool::pathAndEnvironment(this, &projectInfo.qmlDumpPath, &projectInfo.qmlDumpEnvironment);
projectInfo.importPaths.removeDuplicates();
if (projectInfo.qmlDumpPath.isNull()) {
projectInfo.qmlDumpPath = QmlDumpTool::qmlDumpPath(this);
}
modelManager->updateProjectInfo(projectInfo);
}
@@ -1136,6 +1133,10 @@ namespace {
CentralizedFolderWatcher::CentralizedFolderWatcher()
{
m_compressTimer.setSingleShot(true);
m_compressTimer.setInterval(200);
connect(&m_compressTimer, SIGNAL(timeout()),
this, SLOT(onTimer()));
connect (&m_watcher, SIGNAL(directoryChanged(QString)),
this, SLOT(folderChanged(QString)));
}
@@ -1229,8 +1230,20 @@ void CentralizedFolderWatcher::unwatchFolders(const QList<QString> &folders, Qt4
}
}
void CentralizedFolderWatcher::folderChanged(const QString &folder)
{
m_changedFolders.insert(folder);
m_compressTimer.start();
}
void CentralizedFolderWatcher::onTimer()
{
foreach(const QString &folder, m_changedFolders)
delayedFolderChanged(folder);
m_changedFolders.clear();
}
void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
{
if (debugCFW)
qDebug()<<"CFW::folderChanged"<<folder;
@@ -1262,7 +1275,6 @@ void CentralizedFolderWatcher::folderChanged(const QString &folder)
if (!folder.endsWith('/'))
folderWithSlash.append('/');
// If a subdirectory was added, watch it too
QSet<QString> tmp = recursiveDirs(folderWithSlash);
if (!tmp.isEmpty()) {