diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:19:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:19:02 +0100 |
| commit | acddf902facb16b40d3f9c0ccd28fcdbc49c87dc (patch) | |
| tree | a8df4e7c92866994e6f759d3502b3ef646045511 /src/winextras/qwineventfilter.cpp | |
| parent | 4372bfab4247fe4468ad4d38071ff1c4b920585c (diff) | |
| parent | cffeddfab1467561ec7a2df7ccbe6c634cdf89a6 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I2b3428a182d8012eee19acbaa0666c184a26d8d0
Diffstat (limited to 'src/winextras/qwineventfilter.cpp')
| -rw-r--r-- | src/winextras/qwineventfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp index d96efae..3f6f013 100644 --- a/src/winextras/qwineventfilter.cpp +++ b/src/winextras/qwineventfilter.cpp @@ -72,7 +72,7 @@ bool QWinEventFilter::nativeEventFilter(const QByteArray &, void *message, long QWindow *window = 0; switch (msg->message) { case WM_DWMCOLORIZATIONCOLORCHANGED : - event = new QWinColorizationChangeEvent(msg->wParam, msg->lParam); + event = new QWinColorizationChangeEvent(QRgb(msg->wParam), msg->lParam); break; case WM_DWMCOMPOSITIONCHANGED : event = new QWinCompositionChangeEvent(QtWin::isCompositionEnabled()); |