diff options
author | Alessandro Portale <alessandro.portale@digia.com> | 2014-10-21 11:46:32 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@digia.com> | 2014-10-22 09:04:23 +0200 |
commit | 4fbd2dd4a633a94d736a80e837fde654d1a14149 (patch) | |
tree | 9ac2fead78c7d9b25969297e957f06688ace7096 /src | |
parent | 763a48fe1af5b0482f929a79ded05ea21456a916 (diff) | |
download | qtbase-4fbd2dd4a633a94d736a80e837fde654d1a14149.tar.gz |
Windows: Initialize the mouse cursor resources
Initializing resources is required for static Qt builds on Windows.
Task-number: QTBUG-42075
Change-Id: I3074fd8ab57ac48762f589eb3776ed5cc7e2e31d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/windows/qwindowscursor.cpp | 12 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowscursor.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp index d2460e0640..f5d6c140bf 100644 --- a/src/plugins/platforms/windows/qwindowscursor.cpp +++ b/src/plugins/platforms/windows/qwindowscursor.cpp @@ -48,6 +48,13 @@ #include <QtCore/QDebug> #include <QtCore/QScopedArrayPointer> +static void initResources() +{ +#if !defined (Q_OS_WINCE) && !defined (QT_NO_IMAGEFORMAT_PNG) + Q_INIT_RESOURCE(cursors); +#endif +} + QT_BEGIN_NAMESPACE Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); @@ -568,6 +575,11 @@ QWindowsWindowCursor QWindowsCursor::pixmapWindowCursor(const QCursor &c) return it.value(); } +QWindowsCursor::QWindowsCursor() +{ + initResources(); +} + /*! \brief Set a cursor on a window. diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h index c8e1df3f4d..a024646553 100644 --- a/src/plugins/platforms/windows/qwindowscursor.h +++ b/src/plugins/platforms/windows/qwindowscursor.h @@ -91,7 +91,7 @@ public: CursorSuppressed // Cursor suppressed by touch interaction (Windows 8). }; - QWindowsCursor() {} + QWindowsCursor(); void changeCursor(QCursor * widgetCursor, QWindow * widget) Q_DECL_OVERRIDE; QPoint pos() const Q_DECL_OVERRIDE; |