From 964f5757ea00c5fd4a8c617e8df1bfa353c5b225 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 27 Jul 2020 15:47:59 +0200 Subject: Windows QPA: Move some internal functions to the new interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/widgets/dialogs/qwizard_win.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/widgets/dialogs/qwizard_win.cpp') diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 8edbe14150..c80db1fd94 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -43,6 +43,7 @@ #include "qwizard_win_p.h" #include +#include #include #include #include "qwizard.h" @@ -259,11 +260,8 @@ static bool getCaptionQFont(int dpi, QFont *result) return false; // Call into QWindowsNativeInterface to convert the LOGFONT into a QFont. const LOGFONT logFont = getCaptionLogFont(hTheme); - QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface(); - return ni && QMetaObject::invokeMethod(ni, "logFontToQFont", Qt::DirectConnection, - Q_RETURN_ARG(QFont, *result), - Q_ARG(const void*, &logFont), - Q_ARG(int, dpi)); + *result = QWindowsFontDatabaseBase::LOGFONT_to_QFont(logFont, dpi); + return true; } void QVistaHelper::drawTitleBar(QPainter *painter) -- cgit v1.2.3