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

Avoid more deprecation warnings

Browse Source 
Change-Id: Icc7bb7a4ccf7fc9f89f6f668c194ccd440e5231c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-07-04 19:00:20 +02:00
parent 6e4d0a70e9
commit c77cef5706
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -826,7 +826,7 @@ void CentralizedFolderWatcher::watchFolders(const QList<QString> &folders, Qmake
// we add the recursive directories we find
QSet<QString> tmp = recursiveDirs(folder);
if (!tmp.isEmpty())
m_watcher.addPaths(tmp.toList());
m_watcher.addPaths(Utils::toList(tmp));
m_recursiveWatchedFolders += tmp;
}
}
@@ -922,7 +922,7 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
// If a subdirectory was added, watch it too
QSet<QString> tmp = recursiveDirs(folderWithSlash);
if (!tmp.isEmpty()) {
QSet<QString> alreadyAdded = m_watcher.directories().toSet();
QSet<QString> alreadyAdded = Utils::toSet(m_watcher.directories());
tmp.subtract(alreadyAdded);
if (!tmp.isEmpty())
m_watcher.addPaths(Utils::toList(tmp));