Declarative: Remove qpa-conditionals from test profiles.

Change-Id: I72619c5f76cd455c3fd4ca992dadef73901c1b18
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index e68a93c..8fba6f7 100644 (file)
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -10,4 +10,4 @@ CONFIG += parallel_test
 CONFIG += insignificant_test
 QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private testlib
 
-qpa:CONFIG+=insignificant_test  # QTBUG-20990, aborts
+CONFIG+=insignificant_test  # QTBUG-20990, aborts

diff --git a/tests/auto/qtquick1/examples/examples.pro b/tests/auto/qtquick1/examples/examples.pro
index ca4ad04..3086ea1 100644 (file)
--- a/tests/auto/qtquick1/examples/examples.pro
+++ b/tests/auto/qtquick1/examples/examples.pro
@@ -11,4 +11,4 @@ CONFIG += parallel_test
 
 QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib
 
-qpa:CONFIG+=insignificant_test  # QTBUG-20990, aborts
+CONFIG+=insignificant_test  # QTBUG-20990, aborts

diff --git a/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro b/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro
index 3b0fd67..eefb4d5 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro
+++ b/tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro
@@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 CONFIG += parallel_test
 
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib
-qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test  # QTBUG-21012 fails on exit (X11-specific)
+contains(QT_CONFIG,xcb):CONFIG+=insignificant_test  # QTBUG-21012 fails on exit (X11-specific)

diff --git a/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro b/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro
index a42997d..67bd8ae 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro
+++ b/tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro
@@ -6,4 +6,4 @@ macx:CONFIG -= app_bundle
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 QT += core-private gui-private widgets-private declarative-private qtquick1-private testlib
-qpa:CONFIG+=insignificant_test  # QTBUG-21013 unstable
+CONFIG+=insignificant_test  # QTBUG-21013 unstable

diff --git a/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro b/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro
index 31a71a5..8663c69 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro
+++ b/tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro
@@ -9,4 +9,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
 CONFIG += parallel_test
 
 QT += core-private gui-private widgets-private v8-private declarative-private qtquick1-private testlib
-qpa:contains(QT_CONFIG,xcb):CONFIG+=insignificant_test  # QTBUG-21012 fails on exit (X11-specific)
+contains(QT_CONFIG,xcb):CONFIG+=insignificant_test  # QTBUG-21012 fails on exit (X11-specific)

diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 58027bf..f6af129 100644 (file)
--- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -1630,10 +1630,8 @@ void tst_qdeclarativetextedit::positionAt()
     int pos = texteditObject->positionAt(texteditObject->width()/2, y0);
     int diff = abs(int(fm.width(texteditObject->text().left(pos))-texteditObject->width()/2));
 
-#ifdef Q_WS_QPA
     QEXPECT_FAIL("", "QTBUG-21016 fails", Continue);
-#endif
-    // some tollerance for different fonts.
+    // some tolerance for different fonts.
 #ifdef Q_OS_LINUX
     QVERIFY(diff < 2);
 #else