diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2012-10-09 11:27:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 13:15:57 +0200 |
| commit | 06332df7438c8d2215b02f1e01ce2ed28a49a320 (patch) | |
| tree | 3d8b8ad1896d611b349717b80f5b33464653fa9b /tests/auto/widgets/kernel | |
| parent | 571545590149fe9bb3cce308490d66ac2c3f1318 (diff) | |
Mac: Bring back "Text boxes and list only" tab navigation
Added ThemeHint::TabAllWidgets as a mean to access that platform
specific bool. The default implementation returns always true when
querying QPlatformTheme::themeHint().
Several auto-tests had to be updated to reflect for qt_tab_all_widgets'
type change. One XFAIL removed from tst_QApplication::focusChanged().
Task-number: QTBUG-24372
Change-Id: Ie1f0486c19898fe54c53aa4a27e378485075e512
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'tests/auto/widgets/kernel')
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 2a3a3a166e..9ea8589e76 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -100,7 +100,7 @@ static QList<struct QWindowSystemInterface::TouchPoint> touchPointList(const QLi -extern bool Q_GUI_EXPORT qt_tab_all_widgets; // from qapplication.cpp +extern bool Q_GUI_EXPORT qt_tab_all_widgets(); // from qapplication.cpp QT_END_NAMESPACE class tst_QApplication : public QObject @@ -1597,14 +1597,10 @@ void tst_QApplication::focusChanged() QSettings appleSettings(QLatin1String("apple.com")); QVariant appleValue = appleSettings.value(QLatin1String("AppleKeyboardUIMode"), 0); tabAllControls = (appleValue.toInt() & 0x2); - if (!tabAllControls) { - QEXPECT_FAIL("", "QTBUG-24372 Mac tab key \"Text boxes and lists only\" vs " - "\"All controls\" setting is not respected in Qt5", Abort); - } #endif // make sure Qt's idea of tabbing between widgets matches what we think it should - QCOMPARE(qt_tab_all_widgets, tabAllControls); + QCOMPARE(qt_tab_all_widgets(), tabAllControls); tab.simulate(now); if (!tabAllControls) { |