Windows QPA plugin: Remove some duplicated declarations
Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ic132495da4bfc12ecf303d018fb4d9ba1c8a1128 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
ec082fdea6
commit
71c2c03477
@ -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.
|
||||
|
@ -16,6 +16,8 @@
|
||||
#include <qpa/qwindowsysteminterface.h>
|
||||
#include <private/qhighdpiscaling_p.h>
|
||||
#include <private/qwindowsfontdatabasebase_p.h>
|
||||
#include <private/qpixmap_win_p.h>
|
||||
|
||||
#include <QtGui/qscreen.h>
|
||||
|
||||
#include <QtCore/qdebug.h>
|
||||
@ -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;
|
||||
|
@ -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 <QtCore/qt_windows.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user