From 30f5da17b5bb2632757a6c5f88cf8e878255afda Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 20 Feb 2023 08:34:51 +0100 Subject: [PATCH] Windows QPA plugin: Remove some duplicated declarations Task-number: QTBUG-109394 Change-Id: Ic132495da4bfc12ecf303d018fb4d9ba1c8a1128 Reviewed-by: Joerg Bornemann (cherry picked from commit 71c2c03477bdfed9542f06bf89494b65d8b214c5) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 8 -------- src/plugins/platforms/windows/qwindowsscreen.cpp | 4 ++-- src/plugins/platforms/windows/qwindowsservices.cpp | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 7b49a424e2b..a8dbd8633e4 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -60,14 +60,6 @@ static inline QString guidToString(const GUID &g) << "}};"; return rc; } - -inline QDebug operator<<(QDebug d, const GUID &g) -{ - QDebugStateSaver saver(d); - d.nospace(); - d << guidToString(g); - return d; -} #endif // !QT_NO_DEBUG_STREAM // Return an allocated wchar_t array from a QString, reserve more memory if desired. diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index f15a7a870d8..5414fc2778e 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -16,6 +16,8 @@ #include #include #include +#include + #include #include @@ -270,8 +272,6 @@ QString QWindowsScreen::name() const : m_data.name; } -Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); - QPixmap QWindowsScreen::grabWindow(WId window, int xIn, int yIn, int width, int height) const { QSize windowSize; diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp index 2c84204d2b2..d9bb76d10a5 100644 --- a/src/plugins/platforms/windows/qwindowsservices.cpp +++ b/src/plugins/platforms/windows/qwindowsservices.cpp @@ -1,7 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#define QT_NO_URL_CAST_FROM_STRING #include "qwindowsservices.h" #include