diff options
| author | Bernd Weimer <bweimer@blackberry.com> | 2014-04-24 18:21:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-30 13:01:53 +0200 |
| commit | bc59d42e0f0d31d944bc7ae732bba6808e9cb4f6 (patch) | |
| tree | 8315389c112472be9546418217cd5ef63dfcec59 | |
| parent | 67a101af142355a0ca7cdc234b7ee1716a25d87c (diff) | |
QNX: Fix qquicktext auto test
Change-Id: I06acf7dcd6e83c6b665163f4eb9e5ee55ecf85b2
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| -rw-r--r-- | tests/auto/quick/qquicktext/data/horizontalAlignment_RightToLeft.qml | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/quick/qquicktext/data/horizontalAlignment_RightToLeft.qml b/tests/auto/quick/qquicktext/data/horizontalAlignment_RightToLeft.qml index 5ba4d35684..876d325d5a 100644 --- a/tests/auto/quick/qquicktext/data/horizontalAlignment_RightToLeft.qml +++ b/tests/auto/quick/qquicktext/data/horizontalAlignment_RightToLeft.qml @@ -9,7 +9,7 @@ Rectangle { Rectangle { anchors.centerIn: parent - width: 180 + width: parent.width height: 20 color: "green" diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index d36c55d687..0a7c8c9f92 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -732,10 +732,15 @@ void tst_qquicktext::horizontalAlignment() void tst_qquicktext::horizontalAlignment_RightToLeft() { +#if defined(Q_OS_BLACKBERRY) + QQuickWindow dummy; // On BlackBerry first window is always full screen, + dummy.showFullScreen(); // so make test window a second window. +#endif + QQuickView *window = createView(testFile("horizontalAlignment_RightToLeft.qml")); QQuickText *text = window->rootObject()->findChild<QQuickText*>("text"); QVERIFY(text != 0); - window->show(); + window->showNormal(); QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(text); QVERIFY(textPrivate != 0); |