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

Merge remote-tracking branch 'gerrit/2.6'

Browse Source 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
This commit is contained in:
Oswald Buddenhagen
2012-09-12 17:27:37 +02:00
parent c12cefbb51 77a6b71f72
commit e730e2bb8a
93 changed files with 880 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -730,15 +730,11 @@ void Qt4PriFileNode::watchFolders(const QSet<QString> &folders)
m_watchedFolders = folders;
}
void Qt4PriFileNode::folderChanged(const QString &folder)
void Qt4PriFileNode::folderChanged(const QString &changedFolder)
{
//qDebug()<<"########## Qt4PriFileNode::folderChanged";
// So, we need to figure out which files changed.
QString changedFolder = folder;
if (!changedFolder.endsWith(QLatin1Char('/')))
changedFolder.append(QLatin1Char('/'));
// Collect all the files
QSet<Utils::FileName> newFiles;
newFiles += recursiveEnumerate(changedFolder);