From 73cd5c4aa762f15da3e0e1d4a4aabb1d5ddad762 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Mon, 11 Feb 2019 18:46:05 +0300
Subject: QQuickTheme: get rid of stale code

q_ptr isn't used any more

Change-Id: Ib73b8310c13b9b0cca9b0b277b66bef444ceeda2
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 src/quicktemplates2/qquicktheme.cpp   | 1 -
 src/quicktemplates2/qquicktheme_p_p.h | 3 ---
 2 files changed, 4 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
-- 
cgit v1.2.3


From 49b1e3ff2ac20d8aa8b3889fc76ab4e6907817fd Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Tue, 19 Nov 2019 13:09:01 +0100
Subject: Attempt to stabilise tst_qquickpopup::closeOnEscapeWithVisiblePopup()

It's flaky on openSUSE. Whenever it would fail, the activeFocusItem
was always null, so check for that before doing the key press.

Change-Id: Ib31d4869902b40424b3994d1d468a3eace8847f0
Fixes: QTBUG-80164
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 tests/auto/qquickpopup/tst_qquickpopup.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 7da20c37..b5c59e02 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -1026,12 +1026,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());
 }
-- 
cgit v1.2.3