Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (56 commits)
  fixed treatment of zlib on Mac when crossbuilding
  Partial overloading support for qdbus cli tool.
  Allow empty authority in QUrl::setAuthority as per docs.
  Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.
  fixed case of GL include directory
  check in MAC_APPLICATION_MENU translations
  Re-generate the Unicode tables after updates to the program that generates them
  Fix the code after merge: DerivedNormalizationProps has two or more columns
  add some usefull definitions to qunicodetables_p.h
  qchar.cpp: fix identation
  finish last commit
  prefer DerivedNormalizationProps.txt over CompositionExclusions.txt
  improve error reporting a bit more
  improve error reporting
  fix incorect condition
  check if string to int conversions were done w/o errors
  improve error reporting for unassigned grapheme/word/sentence break classes
  avoid using of qunicodetables_p.h in generator
  use QHash for line break map
  use QHash for age map
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 6d8c97b..3622bac 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -3433,8 +3433,10 @@ void QWidgetPrivate::show_sys()
                 // The window is modally shaddowed, so we need to make
                 // sure that we don't pop in front of the modal window:
                 [window orderFront:window];
-                if (NSWindow *modalWin = qt_mac_window_for(top))
-                    [modalWin orderFront:window];
+                if (!top->testAttribute(Qt::WA_DontShowOnScreen)) {
+                    if (NSWindow *modalWin = qt_mac_window_for(top))
+                        [modalWin orderFront:window];
+                }
             }
 #endif
             if (q->windowType() == Qt::Popup) {