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

AutoTest: Add support for more Quick test options

Browse Source 
Change-Id: I52ab537c1a5ca135e6e9ea8aa3033243fcfa04f5
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-06-14 08:58:44 +02:00
parent 8a3e171e7e
commit 1458ea5806
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/autotest/qtest/qttest_utils.cpp
View File

@@ -97,8 +97,9 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted,
// handle Quick options as well // handle Quick options as well
static const QSet<QString> knownInterferingQuickOption = { "-qtquick1" }; static const QSet<QString> knownInterferingQuickOption = { "-qtquick1" };
static const QSet<QString> knownAllowedQuickOptionsWithParameter { static const QSet<QString> knownAllowedQuickOptionsWithParameter {
"-import", "-plugins", "-input" "-import", "-plugins", "-input", "-translation"
}; };
static const QSet<QString> knownAllowedSingleQuickOptions = { "-opengl", "-widgets" };
QStringList allowed; QStringList allowed;
auto it = provided.cbegin(); auto it = provided.cbegin();
@@ -126,6 +127,8 @@ QStringList filterInterfering(const QStringList &provided, QStringList *omitted,
++it; ++it;
QTC_ASSERT(it != end, return QStringList()); QTC_ASSERT(it != end, return QStringList());
allowed.append(*it); allowed.append(*it);
} else if (knownAllowedSingleQuickOptions.contains(currentOpt)) {
allowed.append(currentOpt);
} else if (knownInterferingQuickOption.contains(currentOpt)) { } else if (knownInterferingQuickOption.contains(currentOpt)) {
if (omitted) if (omitted)
omitted->append(currentOpt); omitted->append(currentOpt);