diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-08 14:12:12 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-08 21:58:41 +0200 |
commit | 0651a4c27410ee48419a98985e6eea35c9f2a02b (patch) | |
tree | b97941bdb1bcb82e6bf1e381940e2ec4d8eb5340 /src/widgets/kernel/qapplication.cpp | |
parent | aad8d17f74ebdc59d15aaeec475670cf9aee8fed (diff) |
Remove global GDI helpers qt_win_display_dc and qt_region_from_HRGN
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>
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
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 } /*! |