From 0651a4c27410ee48419a98985e6eea35c9f2a02b Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 8 Apr 2020 14:12:12 +0200
Subject: Remove global GDI helpers qt_win_display_dc and qt_region_from_HRGN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

They were no longer used anyway.

Change-Id: I565480cf39d2d8a27735afe56ac6537bc62fbd4a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/widgets/kernel/qapplication.cpp | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'src/widgets/kernel/qapplication.cpp')

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 5276268f08..febce461bb 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -102,10 +102,6 @@
 #include "private/qgesturemanager_p.h"
 #include <qpa/qplatformfontdatabase.h>
 
-#ifdef Q_OS_WIN
-#include <QtCore/qt_windows.h> // for qt_win_display_dc()
-#endif
-
 #include "qdatetime.h"
 
 #include <qpa/qplatformwindow.h>
@@ -755,35 +751,12 @@ QApplication::~QApplication()
 #endif
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-// #fixme: Remove.
-static HDC         displayDC        = 0;                // display device context
-
-Q_WIDGETS_EXPORT HDC qt_win_display_dc()                        // get display DC
-{
-    Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
-    if (!displayDC)
-        displayDC = GetDC(0);
-    return displayDC;
-}
-#endif
-#endif
-
 void qt_cleanup()
 {
     QPixmapCache::clear();
     QColormap::cleanup();
 
     QApplicationPrivate::active_window = nullptr; //### this should not be necessary
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
-    if (displayDC) {
-        ReleaseDC(0, displayDC);
-        displayDC = 0;
-    }
-#endif
-#endif
 }
 
 /*!
-- 
cgit v1.2.3