diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:44:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:21:22 +0200 |
| commit | b5552bab40f2e165cf7196993ffc83785f4d8264 (patch) | |
| tree | 5ca863fc90caacebd7bd5ebd2464d4b18efdd0dc /tests/auto/other | |
| parent | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (diff) | |
| parent | 01ce104a3ee3c8af68f6694840931661666984ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Manually changed enum to LibGL in
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 10ccebfec2..9715375e95 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -1935,7 +1935,7 @@ void tst_QAccessibility::lineEditTest() QVERIFY(iface->state().movable); QVERIFY(iface->state().focusable); QVERIFY(iface->state().selectable); - QVERIFY(iface->state().hasPopup); + QVERIFY(!iface->state().hasPopup); QCOMPARE(bool(iface->state().focused), le->hasFocus()); QString secret(QLatin1String("secret")); @@ -1963,7 +1963,7 @@ void tst_QAccessibility::lineEditTest() QVERIFY(!(iface->state().movable)); QVERIFY(iface->state().focusable); QVERIFY(iface->state().selectable); - QVERIFY(iface->state().hasPopup); + QVERIFY(!iface->state().hasPopup); QCOMPARE(bool(iface->state().focused), le->hasFocus()); QLineEdit *le2 = new QLineEdit(toplevel); |