1 files changed, 5 insertions, 41 deletions

diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 3559335747..843f7e2ad6 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -41,7 +41,7 @@
 #define QWINDOWSCONTEXT_H
 
 #include "qtwindowsglobal.h"
-#include "qtwindows_additional.h"
+#include <QtCore/qt_windows.h>
 
 #include <QtCore/QScopedPointer>
 #include <QtCore/QSharedPointer>
@@ -79,38 +79,23 @@ class QPoint;
 class QKeyEvent;
 class QTouchDevice;
 
-#ifndef Q_OS_WINCE
 struct QWindowsUser32DLL
 {
     QWindowsUser32DLL();
     inline void init();
     inline bool initTouch();
 
-    typedef BOOL (WINAPI *IsTouchWindow)(HWND, PULONG);
+    typedef BOOL (WINAPI *IsTouchWindow)(HWND, PULONG); // Windows 7
     typedef BOOL (WINAPI *RegisterTouchWindow)(HWND, ULONG);
     typedef BOOL (WINAPI *UnregisterTouchWindow)(HWND);
     typedef BOOL (WINAPI *GetTouchInputInfo)(HANDLE, UINT, PVOID, int);
     typedef BOOL (WINAPI *CloseTouchInputHandle)(HANDLE);
-    typedef BOOL (WINAPI *SetLayeredWindowAttributes)(HWND, COLORREF, BYTE, DWORD);
-    typedef BOOL (WINAPI *UpdateLayeredWindow)(HWND, HDC , const POINT *,
-                 const SIZE *, HDC, const POINT *, COLORREF,
-                 const BLENDFUNCTION *, DWORD);
-    typedef BOOL (WINAPI *UpdateLayeredWindowIndirect)(HWND, const UPDATELAYEREDWINDOWINFO *);
-    typedef BOOL (WINAPI *IsHungAppWindow)(HWND);
     typedef BOOL (WINAPI *SetProcessDPIAware)();
     typedef BOOL (WINAPI *AddClipboardFormatListener)(HWND);
     typedef BOOL (WINAPI *RemoveClipboardFormatListener)(HWND);
     typedef BOOL (WINAPI *GetDisplayAutoRotationPreferences)(DWORD *);
     typedef BOOL (WINAPI *SetDisplayAutoRotationPreferences)(DWORD);
 
-    // Functions missing in Q_CC_GNU stub libraries.
-    SetLayeredWindowAttributes setLayeredWindowAttributes;
-    UpdateLayeredWindow updateLayeredWindow;
-
-    // Functions missing in older versions of Windows
-    UpdateLayeredWindowIndirect updateLayeredWindowIndirect;
-    IsHungAppWindow isHungAppWindow;
-
     // Touch functions from Windows 7 onwards (also for use with Q_CC_MSVC).
     IsTouchWindow isTouchWindow;
     RegisterTouchWindow registerTouchWindow;
@@ -121,7 +106,8 @@ struct QWindowsUser32DLL
     // Windows Vista onwards
     SetProcessDPIAware setProcessDPIAware;
 
-    // Clipboard listeners, Windows Vista onwards
+    // Clipboard listeners are present on Windows Vista onwards
+    // but missing in MinGW 4.9 stub libs. Can be removed in MinGW 5.
     AddClipboardFormatListener addClipboardFormatListener;
     RemoveClipboardFormatListener removeClipboardFormatListener;
 
@@ -130,24 +116,6 @@ struct QWindowsUser32DLL
     SetDisplayAutoRotationPreferences setDisplayAutoRotationPreferences;
 };
 
-struct QWindowsShell32DLL
-{
-    QWindowsShell32DLL();
-    inline void init();
-
-    typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **);
-    typedef HRESULT (WINAPI *SHGetKnownFolderIDList)(const GUID &, DWORD, HANDLE, PIDLIST_ABSOLUTE *);
-    typedef HRESULT (WINAPI *SHGetStockIconInfo)(int , int , _SHSTOCKICONINFO *);
-    typedef HRESULT (WINAPI *SHGetImageList)(int, REFIID , void **);
-    typedef HRESULT (WINAPI *SHCreateItemFromIDList)(PCIDLIST_ABSOLUTE, REFIID, void **);
-
-    SHCreateItemFromParsingName sHCreateItemFromParsingName;
-    SHGetKnownFolderIDList sHGetKnownFolderIDList;
-    SHGetStockIconInfo sHGetStockIconInfo;
-    SHGetImageList sHGetImageList;
-    SHCreateItemFromIDList sHCreateItemFromIDList;
-};
-
 // Shell scaling library (Windows 8.1 onwards)
 struct QWindowsShcoreDLL {
     QWindowsShcoreDLL();
@@ -163,8 +131,6 @@ struct QWindowsShcoreDLL {
     GetDpiForMonitor getDpiForMonitor;
 };
 
-#endif // Q_OS_WINCE
-
 class QWindowsContext
 {
     Q_DISABLE_COPY(QWindowsContext)
@@ -236,11 +202,9 @@ public:
     QWindowsMimeConverter &mimeConverter() const;
     QWindowsScreenManager &screenManager();
     QWindowsTabletSupport *tabletSupport() const;
-#ifndef Q_OS_WINCE
+
     static QWindowsUser32DLL user32dll;
-    static QWindowsShell32DLL shell32dll;
     static QWindowsShcoreDLL shcoredll;
-#endif
 
     static QByteArray comErrorString(HRESULT hr);
     bool asyncExpose() const;