diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
| commit | 1dade1bd8ad13a16152aff36351ac570b5b9fdf6 (patch) | |
| tree | eafed5710b34c327a98381ca15fe1985a6487b10 /src/plugins/platforms/cocoa/qcocoawindowmanager.mm | |
| parent | d45908e24292a41ff7838366b34be7340bf9fda5 (diff) | |
| parent | fb703aea697b12de4810deec9f8605fd062208bd (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/corelib/tools/qlist.h
src/gui/painting/qcompositionfunctions.cpp
src/gui/painting/qtriangulator_p.h
src/gui/text/qfontengine_p.h
src/network/kernel/qhostinfo_p.h
src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindowmanager.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindowmanager.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindowmanager.mm b/src/plugins/platforms/cocoa/qcocoawindowmanager.mm index 879bfaa546..9c45d8c7fc 100644 --- a/src/plugins/platforms/cocoa/qcocoawindowmanager.mm +++ b/src/plugins/platforms/cocoa/qcocoawindowmanager.mm @@ -92,7 +92,8 @@ void QCocoaWindowManager::modalSessionChanged() if (NSApp.modalWindow) { // Lower window to that of the modal windows, but no less nativeWindow.level = NSModalPanelWindowLevel; - [nativeWindow orderBack:nil]; + if ([nativeWindow isVisible]) + [nativeWindow orderBack:nil]; } else { // Restore window's natural window level, whatever that was nativeWindow.level = naturalWindowLevel; |