diff options
| author | Robin Burchell <robin+qt@viroteck.net> | 2013-12-05 02:47:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-10 22:54:46 +0100 |
| commit | e2706405864e6be4a7f6b6ed372b680a61f6adad (patch) | |
| tree | 3e572ef50e6e6d8f61400809d1a1b3c1c8eb83d7 | |
| parent | 96acdc986724ed90c6423287c35c2c89876158ba (diff) | |
Fix up listening for layout direction changes.
Change the event type to ApplicationLayoutDirectionChange. LayoutDirectionChange
is sent for QWidgets only at present, and was wrong anyway: each widget may have
a different layoutDirection, but the application instance only has one -- tied
to ApplicationLayoutDirectionChange.
Relies on I2d2ac7dc07f11be5c7e501a3575b1d0978d8ac31 from qtbase to actually function.
Task-number: QTBUG-21573
Change-Id: Ibee25927b2213ae9145d46556698f54d5129bd06
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| -rw-r--r-- | src/quick/util/qquickapplication.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickapplication/tst_qquickapplication.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp index 244e13888c..fb7c900252 100644 --- a/src/quick/util/qquickapplication.cpp +++ b/src/quick/util/qquickapplication.cpp @@ -123,7 +123,7 @@ bool QQuickApplication::eventFilter(QObject *, QEvent *event) if (d->isActive != wasActive) { emit activeChanged(); } - } else if (event->type() == QEvent::LayoutDirectionChange) { + } else if (event->type() == QEvent::ApplicationLayoutDirectionChange) { Qt::LayoutDirection newDirection = QGuiApplication::layoutDirection(); if (d->direction != newDirection) { d->direction = newDirection; diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp index ef27445920..dfcef43a7e 100644 --- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp +++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp @@ -184,7 +184,6 @@ void tst_qquickapplication::layoutDirection() // mirrored QGuiApplication::setLayoutDirection(Qt::RightToLeft); - QEXPECT_FAIL("", "QTBUG-21573", Abort); QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::RightToLeft); // not mirrored again |