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

Utils: Add toSet/toList functions

Browse Source 
As replacement for functionality that's being deprecated
in Qt but still useful or needed, or that cannot easily be handled
without resorting to #if QT_VERSION checks in user code.

Change-Id: Id3575a54ff944bf0e89d452d13944fcaee270208
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-06-21 08:40:47 +02:00
parent a6d5da5af2
commit 36fcd52136
13 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/gtest/gtestconfiguration.cpp
View File

@@ -58,18 +58,18 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted)
"--gtest_print_time="
};
QSet<QString> allowed = Utils::filtered(provided.toSet(), [] (const QString &arg) {
QSet<QString> allowed = Utils::filtered(Utils::toSet(provided), [] (const QString &arg) {
return Utils::allOf(knownInterferingOptions, [&arg] (const QString &interfering) {
return !arg.startsWith(interfering);
});
});
if (omitted) {
QSet<QString> providedSet = provided.toSet();
QSet<QString> providedSet = Utils::toSet(provided);
providedSet.subtract(allowed);
omitted->append(providedSet.toList());
omitted->append(Utils::toList(providedSet));
}
return allowed.toList();
return Utils::toList(allowed);
}
QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) const