1 files changed, 8 insertions, 4 deletions
diff --git a/src/quicktemplates/qquickcontrol_p_p.h b/src/quicktemplates/qquickcontrol_p_p.h
index d19c76dfe3..c58ee33ede 100644
--- a/src/quicktemplates/qquickcontrol_p_p.h
+++ b/src/quicktemplates/qquickcontrol_p_p.h
@@ -35,7 +35,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcItemManagement)
 
 class QQuickAccessibleAttached;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
+class Q_QUICKTEMPLATES2_EXPORT QQuickControlPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 #if QT_CONFIG(accessibility)
     , public QAccessible::ActivationObserver
 #endif
@@ -130,8 +130,14 @@ public:
     virtual void cancelBackground();
     virtual void executeBackground(bool complete = false);
 
+    enum class UnhideVisibility {
+        Show,
+        Hide
+    };
+
     static void hideOldItem(QQuickItem *item);
-    static void unhideOldItem(QQuickControl *control, QQuickItem *item);
+    static void unhideOldItem(QQuickControl *control, QQuickItem *item,
+        UnhideVisibility visibility = UnhideVisibility::Show);
 
     void updateBaselineOffset();
 
@@ -200,8 +206,6 @@ public:
     qreal spacing = 0;
     QLocale locale;
     QFont resolvedFont;
-    Qt::FocusPolicy focusPolicy = Qt::NoFocus;
-    Qt::FocusReason focusReason = Qt::OtherFocusReason;
     QQuickDeferredPointer<QQuickItem> background;
     QQuickDeferredPointer<QQuickItem> contentItem;
 };