summaryrefslogtreecommitdiff
path: root/src/widgets/dialogs/qwizard_win.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-27 15:47:59 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-28 13:21:10 +0200
commit964f5757ea00c5fd4a8c617e8df1bfa353c5b225 (patch)
tree998a8a03716a2dc9ad624759ea2fad91421069f0 /src/widgets/dialogs/qwizard_win.cpp
parent2405aa9d6797dcfb2e47f45f113ee1ebbc201dda (diff)
downloadqtbase-964f5757ea00c5fd4a8c617e8df1bfa353c5b225.tar.gz
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/widgets/dialogs/qwizard_win.cpp')
-rw-r--r--src/widgets/dialogs/qwizard_win.cpp8
1 files changed, 3 insertions, 5 deletions
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 <private/qapplication_p.h>
+#include <private/qwindowsfontdatabasebase_p.h>
#include <qpa/qplatformwindow.h>
#include <qpa/qplatformwindow_p.h>
#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)