diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:09:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:09:01 +0100 |
| commit | 2249a1f5154f408da03831e67c2874937241be6b (patch) | |
| tree | 762a0691f2e566b1b2a571643623991ebb79f6eb | |
| parent | d075d35cb583c0d23ec0a0b4651fb24c6f900af1 (diff) | |
| parent | d02b108ec756fc4cf84bd082b7453a8e7fa41ebc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Icf864310f47d54237a10d7a10fa85c14ac313a7e
| -rw-r--r-- | src/winextras/qwinfunctions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h index f7db203..bfa14d1 100644 --- a/src/winextras/qwinfunctions.h +++ b/src/winextras/qwinfunctions.h @@ -198,7 +198,7 @@ namespace QtWin inline void disableBlurBehindWindow(QWidget *window) { if (window->windowHandle()) - enableBlurBehindWindow(window->windowHandle()); + disableBlurBehindWindow(window->windowHandle()); } inline void markFullscreenWindow(QWidget *window, bool fullscreen = true) |