1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index d7397a3d8b..21b1605dfc 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -58,13 +58,11 @@ extern QClipboard *qt_clipboard;
 typedef QHash<QByteArray, QFont> FontHash;
 Q_WIDGETS_EXPORT FontHash *qt_app_fonts_hash();
 
-#define QApplicationPrivateBase QGuiApplicationPrivate
-
-class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase
+class Q_WIDGETS_EXPORT QApplicationPrivate : public QGuiApplicationPrivate
 {
     Q_DECLARE_PUBLIC(QApplication)
 public:
-    QApplicationPrivate(int &argc, char **argv, int flags);
+    QApplicationPrivate(int &argc, char **argv);
     ~QApplicationPrivate();
 
     virtual void notifyLayoutDirectionChange() override;
@@ -86,7 +84,8 @@ public:
 #endif
 
     //modality
-    bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = nullptr) const override;
+    Qt::WindowModality defaultModality() const override;
+    bool windowNeverBlocked(QWindow *window) const override;
     static bool isBlockedByModal(QWidget *widget);
     static bool modalState();
     static bool tryModalHelper(QWidget *widget, QWidget **rettop = nullptr);
@@ -105,6 +104,8 @@ public:
     void initialize();
     void process_cmdline();
 
+    static void setActiveWindow(QWidget* act);
+
     static bool inPopupMode();
     bool popupActive() override { return inPopupMode(); }
     bool closeAllPopups() override;
@@ -144,9 +145,7 @@ public:
     static QWidget *main_widget;
     static QWidget *focus_widget;
     static QWidget *hidden_focus_widget;
-    static QWidget *active_window;
 #if QT_CONFIG(wheelevent)
-    static int  wheel_scroll_lines;
     static QPointer<QWidget> wheel_widget;
 #endif
 
@@ -227,6 +226,7 @@ private:
     static void giveFocusAccordingToFocusPolicy(QWidget *w, QEvent *event, QPoint localPos);
     static bool shouldSetFocus(QWidget *w, Qt::FocusPolicy policy);
 
+    static QWidget *active_window;
 
     static bool isAlien(QWidget *);
 };