Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade"

This reverts commit 8f616969ab482c72092cb7c037a91292a0f159e1.

Turns out that with the upgrade to the new released Qt 5.12.5 the issue
has been solved by the Qt developers, so this fix becomes obsolete.

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 841e8bbb29400b7f0a4d7c78af7e492e6966b0b9..e91b96853be9ad85caa2898c2e6db27f9c07ba5e 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -168,23 +168,6 @@ void SettingsDialog::changeEvent(QEvent *e)
     QDialog::changeEvent(e);
 }
 
-// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
-#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
-void SettingsDialog::showEvent(QShowEvent *e)
-{
-    QDialog::showEvent(e);
-
-    QTimer::singleShot(100, this, &SettingsDialog::timerShowEvent);
-}
-
-void SettingsDialog::timerShowEvent()
-{
-    update();
-    repaint();
-}
-#endif
-// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
-
 void SettingsDialog::slotSwitchPage(QAction *action)
 {
     _ui->stack->setCurrentWidget(_actionGroupWidgets.value(action));

diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index 6ae5f8896489431b9cac4804cf52fa302b29f222..97d15c03c4b49075dfcb1e449efe4ee25f1b3583 100644 (file)
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -68,22 +68,10 @@ protected:
     void accept() override;
     void changeEvent(QEvent *) override;
 
-    // FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
-    #if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
-        void showEvent(QShowEvent *) override;
-    #endif
-    // FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
-
 private slots:
     void accountAdded(AccountState *);
     void accountRemoved(AccountState *);
 
-    // FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
-    #if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
-        void timerShowEvent();
-    #endif
-    // FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
-
 private:
     void customizeStyle();
     void activityAdded(AccountState *);