diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-27 15:47:59 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-28 13:21:10 +0200 |
commit | 964f5757ea00c5fd4a8c617e8df1bfa353c5b225 (patch) | |
tree | 998a8a03716a2dc9ad624759ea2fad91421069f0 /src/plugins/platforms/windows/qwindowsnativeinterface.cpp | |
parent | 2405aa9d6797dcfb2e47f45f113ee1ebbc201dda (diff) |
Windows QPA: Move some internal functions to the new interface
Move createMessageWindow(), the GPU detection for qtdiag and the async
expose setting (used by Active Qt) from QWindowsNativeInterface to
QWindowsApplication.
Remove unused registerWindowClass() and use logFontToQFont() directly from
the font database.
Task-number: QTBUG-83252
Change-Id: I9c72351970b47457d08125557c2580016c66e586
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsnativeinterface.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsnativeinterface.cpp | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp index fe0da98a47..a971cdae0b 100644 --- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp +++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp @@ -43,7 +43,6 @@ #include "qwindowscontext.h" #include "qwindowscursor.h" #include "qwindowsopenglcontext.h" -#include "qwindowsopengltester.h" #include "qwindowsintegration.h" #include "qwindowstheme.h" #include "qwin10helpers.h" @@ -52,7 +51,6 @@ #include <QtGui/qopenglcontext.h> #include <QtGui/qscreen.h> #include <qpa/qplatformscreen.h> -#include <QtGui/private/qwindowsfontdatabase_p.h> QT_BEGIN_NAMESPACE @@ -170,57 +168,4 @@ void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resour } #endif // !QT_NO_OPENGL -/*! - \brief Creates a non-visible window handle for filtering messages. -*/ - -void *QWindowsNativeInterface::createMessageWindow(const QString &classNameTemplate, - const QString &windowName, - void *eventProc) const -{ - QWindowsContext *ctx = QWindowsContext::instance(); - const HWND hwnd = ctx->createDummyWindow(classNameTemplate, - (wchar_t*)windowName.utf16(), - (WNDPROC)eventProc); - return hwnd; -} - -/*! - \brief Registers a unique window class with a callback function based on \a classNameIn. -*/ - -QString QWindowsNativeInterface::registerWindowClass(const QString &classNameIn, void *eventProc) const -{ - return QWindowsContext::instance()->registerWindowClass(classNameIn, (WNDPROC)eventProc); -} - -bool QWindowsNativeInterface::asyncExpose() const -{ - return QWindowsContext::instance()->asyncExpose(); -} - -void QWindowsNativeInterface::setAsyncExpose(bool value) -{ - QWindowsContext::instance()->setAsyncExpose(value); -} - -QFont QWindowsNativeInterface::logFontToQFont(const void *logFont, int verticalDpi) -{ - return QWindowsFontDatabase::LOGFONT_to_QFont(*reinterpret_cast<const LOGFONT *>(logFont), verticalDpi); -} - -QVariant QWindowsNativeInterface::gpu() const -{ - return GpuDescription::detect().toVariant(); -} - -QVariant QWindowsNativeInterface::gpuList() const -{ - QVariantList result; - const auto gpus = GpuDescription::detectAll(); - for (const auto &gpu : gpus) - result.append(gpu.toVariant()); - return result; -} - QT_END_NAMESPACE |