diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-23 03:04:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-23 03:04:47 +0100 |
| commit | ea2734947c55c611db339afd84bdade7fd19ff0c (patch) | |
| tree | 3c078b375b54465d5410731bae38f2cc715effa7 | |
| parent | 016de465ef06fc80380a4e46e29fca9b12448879 (diff) | |
| parent | 49b1e3ff2ac20d8aa8b3889fc76ab4e6907817fd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I36a4d6043e00d97dc98cc9c77aa294a058574f47
| -rw-r--r-- | src/quicktemplates2/qquicktheme.cpp | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktheme_p_p.h | 3 | ||||
| -rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp index 1228714b..f8c4a251 100644 --- a/src/quicktemplates2/qquicktheme.cpp +++ b/src/quicktemplates2/qquicktheme.cpp @@ -109,7 +109,6 @@ static QPlatformTheme::Palette platformPalette(QQuickTheme::Scope scope) QQuickTheme::QQuickTheme() : d_ptr(new QQuickThemePrivate) { - d_ptr->q_ptr = this; } QQuickTheme::~QQuickTheme() diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h index c7421677..29058bc8 100644 --- a/src/quicktemplates2/qquicktheme_p_p.h +++ b/src/quicktemplates2/qquicktheme_p_p.h @@ -54,8 +54,6 @@ QT_BEGIN_NAMESPACE class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickThemePrivate { - Q_DECLARE_PUBLIC(QQuickTheme) - public: static QQuickThemePrivate *get(QQuickTheme *theme) { @@ -70,7 +68,6 @@ public: QScopedPointer<const QPalette> defaultPalette; QSharedPointer<QFont> fonts[NScopes]; QSharedPointer<QPalette> palettes[NScopes]; - QQuickTheme *q_ptr = nullptr; }; QT_END_NAMESPACE diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 76c38ea8..78d55e6a 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -1027,12 +1027,13 @@ void tst_QQuickPopup::closeOnEscapeWithVisiblePopup() QQuickApplicationHelper helper(this, QStringLiteral("closeOnEscapeWithVisiblePopup.qml")); QQuickWindow *window = helper.window; window->show(); - QVERIFY(QTest::qWaitForWindowExposed(window)); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickPopup *popup = window->findChild<QQuickPopup *>("popup"); QVERIFY(popup); QTRY_VERIFY(popup->isOpened()); + QTRY_VERIFY(window->activeFocusItem()); QTest::keyClick(window, Qt::Key_Escape); QTRY_VERIFY(!popup->isVisible()); } |