diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-20 18:16:08 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-20 18:18:59 +0100 |
commit | 9033977d3971db5352a2bb51052a723a2ac57a8f (patch) | |
tree | d1a70bdf5e892cc391f7bbfd61ff5611fe25ce3d /src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp | |
parent | e5e43a2386fb4a4c2cb90d5a8d9bb5ca81a2675e (diff) | |
parent | 03b6a2f0f98b70b24c0cce645d6d58c084111f91 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
src/corelib/tools/qstring.cpp
src/gui/image/image.pri
src/gui/image/qimage.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5
Diffstat (limited to 'src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp')
-rw-r--r-- | src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp index 338817ea74..70e3090cde 100644 --- a/src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp +++ b/src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp @@ -44,7 +44,7 @@ w->setWindowState(w->windowState() ^ Qt::WindowFullScreen); //! [1] -w->setWindowState(w->windowState() & ~Qt::WindowMinimized | Qt::WindowActive); +w->setWindowState((w->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive); //! [1] |