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

Remove more deprecation warnings

Browse Source 
Change-Id: Ie50e41737a4bf7bea41f550df7cc765267e8a144
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-07-05 13:43:54 +02:00
parent 1d010e2686
commit 9ae2794114
9 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -385,8 +385,8 @@ void QmakePriFile::watchFolders(const QSet<FilePath> &folders)
QSet<QString> toWatch = folderStrings;
toWatch.subtract(m_watchedFolders);
m_project->unwatchFolders(toUnwatch.toList(), this);
m_project->watchFolders(toWatch.toList(), this);
m_project->unwatchFolders(Utils::toList(toUnwatch), this);
m_project->watchFolders(Utils::toList(toWatch), this);
m_watchedFolders = folderStrings;
}
@@ -1312,7 +1312,7 @@ QmakeEvalResult *QmakeProFile::evaluate(const QmakeEvalInput &input)
result->includedFiles.children.insert(subDirName, subDir);
}
result->exactSubdirs = subDirs.toSet();
result->exactSubdirs = Utils::toSet(subDirs);
}
// Convert ProFileReader::includeFiles to IncludedPriFile structure