From 20beb5ff538a4de73b7430583829089e39024d05 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 30 Jan 2012 11:26:27 +0100 Subject: Windows: Fix compilation with -qtnamespace Change-Id: Ib006d74299d65e5872a5a524eaa937e127306ec7 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsaccessibility.h | 6 ++++++ src/plugins/platforms/windows/qwindowsfontengine.cpp | 2 -- src/plugins/platforms/windows/qwindowsscreen.cpp | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/windows') diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.h b/src/plugins/platforms/windows/qwindowsaccessibility.h index addd748523..9294f23565 100644 --- a/src/plugins/platforms/windows/qwindowsaccessibility.h +++ b/src/plugins/platforms/windows/qwindowsaccessibility.h @@ -45,6 +45,9 @@ #include "qtwindowsglobal.h" #include +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + class QWindowsAccessibility : public QPlatformAccessibility { public: @@ -58,4 +61,7 @@ public: */ }; +QT_END_NAMESPACE +QT_END_HEADER + #endif // QWINDOWSACCESSIBILITY_H diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp index 8fcfac876e..ffa57ad58f 100644 --- a/src/plugins/platforms/windows/qwindowsfontengine.cpp +++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp @@ -89,8 +89,6 @@ QT_BEGIN_NAMESPACE // common DC for all fonts -QT_BEGIN_NAMESPACE - typedef BOOL (WINAPI *PtrGetCharWidthI)(HDC, UINT, UINT, LPWORD, LPINT); static PtrGetCharWidthI ptrGetCharWidthI = 0; static bool resolvedGetCharWidthI = false; diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index 8efb0aab0e..1dc5175515 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -159,10 +159,10 @@ QWindowsScreen::QWindowsScreen(const QWindowsScreenData &data) : { } +Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); + QPixmap QWindowsScreen::grabWindow(WId window, int x, int y, int width, int height) const { - Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); - if (QWindowsContext::verboseIntegration) qDebug() << __FUNCTION__ << window << x << y << width << height; RECT r; -- cgit v1.2.3