diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-28 10:22:25 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 09:30:02 +0100 |
| commit | 4df4d80f2542c5ec5b8bf06f970f917b47365827 (patch) | |
| tree | 7dab0500375725b9d4427526593c9794d81c141e /tests | |
| parent | 1cb5f20f17ea08b2cc7cd7bcd28b7c658b6dbb66 (diff) | |
Declarative: Remove qpa-conditionals from test profiles.
Change-Id: I72619c5f76cd455c3fd4ca992dadef73901c1b18
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
6 files changed, 6 insertions, 8 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index e68a93c6d5..8fba6f74c5 100644 --- 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 ca4ad04e47..3086ea1413 100644 --- 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 3b0fd671e1..eefb4d5902 100644 --- 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 a42997dc08..67bd8ae6d4 100644 --- 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 31a71a5ab8..8663c69ea4 100644 --- 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 58027bf760..f6af1297bb 100644 --- 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 |