From 1458ea58068fa7c24d4000e7553a4cb8f4c641fe Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Thu, 14 Jun 2018 08:58:44 +0200
Subject: [PATCH] AutoTest: Add support for more Quick test options

Change-Id: I52ab537c1a5ca135e6e9ea8aa3033243fcfa04f5
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/autotest/qtest/qttest_utils.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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