DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
257 Commits
3 Branches
9.1MB
Tree: 00377f543e
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '00377f543e'
${ noResults }
PawPaw/patches/qtbase/macos/01_osx10.8-compat.patch

752 lines
34KB
Raw Blame History 

  1. diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf

  2. index cbae2e6..ed6132c 100644

  3. --- a/mkspecs/common/clang-mac.conf

  4. +++ b/mkspecs/common/clang-mac.conf

  5. @@ -10,4 +10,4 @@ QMAKE_CXXFLAGS += -stdlib=libc++

  6.  QMAKE_LFLAGS   += -stdlib=libc++

  7.  QMAKE_AR_LTCG  = libtool -static -o

  8.  

  9. -QMAKE_CFLAGS_APPLICATION_EXTENSION  = -fapplication-extension

  10. +QMAKE_CFLAGS_APPLICATION_EXTENSION  =

  11. diff --git a/src/corelib/global/qoperatingsystemversion_darwin.mm b/src/corelib/global/qoperatingsystemversion_darwin.mm

  12. index d8b927f..9a690ad 100644

  13. --- a/src/corelib/global/qoperatingsystemversion_darwin.mm

  14. +++ b/src/corelib/global/qoperatingsystemversion_darwin.mm

  15. @@ -40,16 +40,37 @@

  16.  #include "qoperatingsystemversion_p.h"

  17.  #import <Foundation/Foundation.h>

  18.  

  19. +typedef qint16 (*GestaltFunction)(quint32 selector, qint32 *response);

  20. +

  21.  QT_BEGIN_NAMESPACE

  22.  

  23.  QOperatingSystemVersion QOperatingSystemVersion::current()

  24.  {

  25. -    NSOperatingSystemVersion osv = NSProcessInfo.processInfo.operatingSystemVersion;

  26.      QOperatingSystemVersion v;

  27.      v.m_os = currentType();

  28. -    v.m_major = osv.majorVersion;

  29. -    v.m_minor = osv.minorVersion;

  30. -    v.m_micro = osv.patchVersion;

  31. +    v.m_major = -1;

  32. +    v.m_minor = -1;

  33. +    v.m_micro = -1;

  34. +    static GestaltFunction pGestalt = 0;

  35. +    if (!pGestalt) {

  36. +        CFBundleRef b = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.CoreServices"));

  37. +        pGestalt = reinterpret_cast<GestaltFunction>(CFBundleGetFunctionPointerForName(b,

  38. +                                                     CFSTR("Gestalt")));

  39. +    }

  40. +    // Use temporary variables so we can return 0.0.0 (unknown version)

  41. +    // in case of an error partway through determining the OS version

  42. +    qint32 major = 0, minor = 0, patch = 0;

  43. +    if (!pGestalt)

  44. +        return v;

  45. +    if (pGestalt('sys1', &major) != 0)

  46. +        return v;

  47. +    if (pGestalt('sys2', &minor) != 0)

  48. +        return v;

  49. +    if (pGestalt('sys3', &patch) != 0)

  50. +        return v;

  51. +    v.m_major = major;

  52. +    v.m_minor = minor;

  53. +    v.m_micro = patch;

  54.      return v;

  55.  }

  56.  

  57. diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp

  58. index 7fed54f..bbf5e6d 100644

  59. --- a/src/corelib/io/qfilesystemengine_unix.cpp

  60. +++ b/src/corelib/io/qfilesystemengine_unix.cpp

  61. @@ -126,8 +126,11 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e

  62.  

  63.  #ifdef Q_OS_MACOS

  64.          // Find if an application other than Finder claims to know how to handle the package

  65. -        QCFType<CFURLRef> application = LSCopyDefaultApplicationURLForURL(url,

  66. -            kLSRolesEditor | kLSRolesViewer, nullptr);

  67. +        QCFType<CFURLRef> application;

  68. +        LSGetApplicationForURL(url,

  69. +                               kLSRolesEditor|kLSRolesViewer,

  70. +                               NULL,

  71. +                               &application);

  72.  

  73.          if (application) {

  74.              QCFType<CFBundleRef> bundle = CFBundleCreate(kCFAllocatorDefault, application);

  75. diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm

  76. index 56eabc4..c48a797 100644

  77. --- a/src/corelib/kernel/qcore_foundation.mm

  78. +++ b/src/corelib/kernel/qcore_foundation.mm

  79. @@ -46,7 +46,7 @@

  80.  #include <QtCore/qbytearray.h>

  81.  #include <QtCore/qrect.h>

  82.  

  83. -#if QT_CONFIG(timezone) && !defined(QT_NO_SYSTEMLOCALE)

  84. +#if 0

  85.  #include <QtCore/qtimezone.h>

  86.  #include <QtCore/private/qtimezoneprivate_p.h>

  87.  #include <QtCore/private/qcore_mac_p.h>

  88. @@ -433,7 +433,7 @@ NSDate *QDateTime::toNSDate() const

  89.  

  90.  // ----------------------------------------------------------------------------

  91.  

  92. -#if QT_CONFIG(timezone) && !defined(QT_NO_SYSTEMLOCALE)

  93. +#if 0

  94.  /*!

  95.      \since 5.9

  96.  

  97. diff --git a/src/corelib/tools/qtimezone.h b/src/corelib/tools/qtimezone.h

  98. index bd87139..d154cbf 100644

  99. --- a/src/corelib/tools/qtimezone.h

  100. +++ b/src/corelib/tools/qtimezone.h

  101. @@ -47,7 +47,7 @@

  102.  

  103.  QT_REQUIRE_CONFIG(timezone);

  104.  

  105. -#if (defined(Q_OS_DARWIN) || defined(Q_QDOC)) && !defined(QT_NO_SYSTEMLOCALE)

  106. +#if 0

  107.  Q_FORWARD_DECLARE_CF_TYPE(CFTimeZone);

  108.  Q_FORWARD_DECLARE_OBJC_CLASS(NSTimeZone);

  109.  #endif

  110. @@ -147,7 +147,7 @@ public:

  111.      static QList<QByteArray> windowsIdToIanaIds(const QByteArray &windowsId,

  112.                                                   QLocale::Country country);

  113.  

  114. -#if (defined(Q_OS_DARWIN) || defined(Q_QDOC)) && !defined(QT_NO_SYSTEMLOCALE)

  115. +#if 0

  116.      static QTimeZone fromCFTimeZone(CFTimeZoneRef timeZone);

  117.      CFTimeZoneRef toCFTimeZone() const Q_DECL_CF_RETURNS_RETAINED;

  118.      static QTimeZone fromNSTimeZone(const NSTimeZone *timeZone);

  119. diff --git a/src/gui/painting/qcoregraphics.mm b/src/gui/painting/qcoregraphics.mm

  120. index c4fb8af..91875cd 100644

  121. --- a/src/gui/painting/qcoregraphics.mm

  122. +++ b/src/gui/painting/qcoregraphics.mm

  123. @@ -47,6 +47,21 @@

  124.  #include <QtCore/qcoreapplication.h>

  125.  #include <QtCore/qoperatingsystemversion.h>

  126.  

  127. +@interface NSGraphicsContext (QtAdditions)

  128. +

  129. ++ (NSGraphicsContext *)qt_graphicsContextWithCGContext:(CGContextRef)graphicsPort flipped:(BOOL)initialFlippedState;

  130. +

  131. +@end

  132. +

  133. +@implementation NSGraphicsContext (QtAdditions)

  134. +

  135. ++ (NSGraphicsContext *)qt_graphicsContextWithCGContext:(CGContextRef)graphicsPort flipped:(BOOL)initialFlippedState

  136. +{

  137. +    return [self graphicsContextWithGraphicsPort:graphicsPort flipped:initialFlippedState];

  138. +}

  139. +

  140. +@end

  141. +

  142.  QT_BEGIN_NAMESPACE

  143.  

  144.  // ---------------------- Images ----------------------

  145. @@ -147,7 +162,7 @@ QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size)

  146.      QMacCGContext ctx(&pixmap);

  147.      if (!ctx)

  148.          return QPixmap();

  149. -    NSGraphicsContext *gc = [NSGraphicsContext graphicsContextWithCGContext:ctx flipped:YES];

  150. +    NSGraphicsContext *gc = [NSGraphicsContext qt_graphicsContextWithCGContext:ctx flipped:YES];

  151.      if (!gc)

  152.          return QPixmap();

  153.      [NSGraphicsContext saveGraphicsState];

  154. diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm

  155. index f8fe160..3c350b3 100644

  156. --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm

  157. +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm

  158. @@ -456,7 +456,6 @@ QFontEngine *QCoreTextFontDatabaseEngineFactory<QFontEngineFT>::fontEngine(const

  159.          return QFontEngineFT::create(*fontData, fontDef.pixelSize,

  160.              static_cast<QFont::HintingPreference>(fontDef.hintingPreference));

  161.      } else if (NSURL *url = descriptorAttribute<NSURL>(descriptor, kCTFontURLAttribute)) {

  162. -        Q_ASSERT(url.fileURL);

  163.          QFontEngine::FaceId faceId;

  164.          faceId.filename = QString::fromNSString(url.path).toUtf8();

  165.          return QFontEngineFT::create(fontDef, faceId);

  166. diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm

  167. index aa61245..2423378 100644

  168. --- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm

  169. +++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm

  170. @@ -78,7 +78,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);

  171.      mHelper = 0;

  172.      mStolenContentView = 0;

  173.      mPanelButtons = nil;

  174. -    mResultCode = NSModalResponseCancel;

  175. +    mResultCode = NSCancelButton;

  176.      mDialogIsExecuting = false;

  177.      mResultSet = false;

  178.      mClosingDueToKnownButton = false;

  179. @@ -166,7 +166,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);

  180.      mClosingDueToKnownButton = true;

  181.      [mColorPanel close];

  182.      [self updateQtColor];

  183. -    [self finishOffWithCode:NSModalResponseOK];

  184. +    [self finishOffWithCode:NSOKButton];

  185.  }

  186.  

  187.  - (void)onCancelClicked

  188. @@ -175,7 +175,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);

  189.          mClosingDueToKnownButton = true;

  190.          [mColorPanel close];

  191.          mQtColor = QColor();

  192. -        [self finishOffWithCode:NSModalResponseCancel];

  193. +        [self finishOffWithCode:NSCancelButton];

  194.      }

  195.  }

  196.  

  197. @@ -236,12 +236,12 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);

  198.  

  199.      [NSApp runModalForWindow:mColorPanel];

  200.      mDialogIsExecuting = false;

  201. -    return (mResultCode == NSModalResponseOK);

  202. +    return (mResultCode == NSOKButton);

  203.  }

  204.  

  205.  - (QPlatformDialogHelper::DialogCode)dialogResultCode

  206.  {

  207. -    return (mResultCode == NSModalResponseOK) ? QPlatformDialogHelper::Accepted : QPlatformDialogHelper::Rejected;

  208. +    return (mResultCode == NSOKButton) ? QPlatformDialogHelper::Accepted : QPlatformDialogHelper::Rejected;

  209.  }

  210.  

  211.  - (BOOL)windowShouldClose:(id)window

  212. @@ -250,7 +250,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);

  213.      if (!mPanelButtons)

  214.          [self updateQtColor];

  215.      if (mDialogIsExecuting) {

  216. -        [self finishOffWithCode:NSModalResponseCancel];

  217. +        [self finishOffWithCode:NSCancelButton];

  218.      } else {

  219.          mResultSet = true;

  220.          if (mHelper)

  221. @@ -276,7 +276,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate);

  222.          // This check will prevent any such recursion.

  223.          if (!mResultSet) {

  224.              mResultSet = true;

  225. -            if (mResultCode == NSModalResponseCancel) {

  226. +            if (mResultCode == NSCancelButton) {

  227.                  emit mHelper->reject();

  228.              } else {

  229.                  emit mHelper->accept();

  230. diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm

  231. index b22f1b1..d2dd645 100644

  232. --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm

  233. +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm

  234. @@ -401,7 +401,7 @@ bool QCocoaEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags)

  235.              // [NSApp run], which is the normal code path for cocoa applications.

  236.              if (NSModalSession session = d->currentModalSession()) {

  237.                  QBoolBlocker execGuard(d->currentExecIsNSAppRun, false);

  238. -                while ([NSApp runModalSession:session] == NSModalResponseContinue && !d->interrupt) {

  239. +                while ([NSApp runModalSession:session] == NSRunContinuesResponse && !d->interrupt) {

  240.                      qt_mac_waitForMoreEvents(NSModalPanelRunLoopMode);

  241.                      if (session != d->currentModalSessionCached) {

  242.                          // It's possible to release the current modal session

  243. @@ -445,7 +445,7 @@ bool QCocoaEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags)

  244.                      if (flags & QEventLoop::WaitForMoreEvents)

  245.                          qt_mac_waitForMoreEvents(NSModalPanelRunLoopMode);

  246.                      NSInteger status = [NSApp runModalSession:session];

  247. -                    if (status != NSModalResponseContinue && session == d->currentModalSessionCached) {

  248. +                    if (status != NSRunContinuesResponse && session == d->currentModalSessionCached) {

  249.                          // INVARIANT: Someone called [NSApp stopModal:] from outside the event

  250.                          // dispatcher (e.g to stop a native dialog). But that call wrongly stopped

  251.                          // 'session' as well. As a result, we need to restart all internal sessions:

  252. diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm

  253. index 9a96895..b227794 100644

  254. --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm

  255. +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm

  256. @@ -104,7 +104,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);

  257.      mHelper = 0;

  258.      mStolenContentView = 0;

  259.      mPanelButtons = 0;

  260. -    mResultCode = NSModalResponseCancel;

  261. +    mResultCode = NSCancelButton;

  262.      mDialogIsExecuting = false;

  263.      mResultSet = false;

  264.  

  265. @@ -169,7 +169,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);

  266.  - (void)onOkClicked

  267.  {

  268.      [mFontPanel close];

  269. -    [self finishOffWithCode:NSModalResponseOK];

  270. +    [self finishOffWithCode:NSOKButton];

  271.  }

  272.  

  273.  - (void)onCancelClicked

  274. @@ -177,7 +177,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);

  275.      if (mPanelButtons) {

  276.          [mFontPanel close];

  277.          mQtFont = QFont();

  278. -        [self finishOffWithCode:NSModalResponseCancel];

  279. +        [self finishOffWithCode:NSCancelButton];

  280.      }

  281.  }

  282.  

  283. @@ -222,12 +222,12 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);

  284.  

  285.      [NSApp runModalForWindow:mFontPanel];

  286.      mDialogIsExecuting = false;

  287. -    return (mResultCode == NSModalResponseOK);

  288. +    return (mResultCode == NSOKButton);

  289.  }

  290.  

  291.  - (QPlatformDialogHelper::DialogCode)dialogResultCode

  292.  {

  293. -    return (mResultCode == NSModalResponseOK) ? QPlatformDialogHelper::Accepted : QPlatformDialogHelper::Rejected;

  294. +    return (mResultCode == NSOKButton) ? QPlatformDialogHelper::Accepted : QPlatformDialogHelper::Rejected;

  295.  }

  296.  

  297.  - (BOOL)windowShouldClose:(id)window

  298. @@ -236,7 +236,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);

  299.      if (!mPanelButtons)

  300.          [self updateQtFont];

  301.      if (mDialogIsExecuting) {

  302. -        [self finishOffWithCode:NSModalResponseCancel];

  303. +        [self finishOffWithCode:NSCancelButton];

  304.      } else {

  305.          mResultSet = true;

  306.          if (mHelper)

  307. @@ -262,7 +262,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSFontPanelDelegate);

  308.          // This check will prevent any such recursion.

  309.          if (!mResultSet) {

  310.              mResultSet = true;

  311. -            if (mResultCode == NSModalResponseCancel) {

  312. +            if (mResultCode == NSCancelButton) {

  313.                  emit mHelper->reject();

  314.              } else {

  315.                  emit mHelper->accept();

  316. diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm

  317. index bac49cf..83b51cd 100644

  318. --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm

  319. +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm

  320. @@ -144,7 +144,7 @@ void QCocoaScreen::updateGeometry()

  321.      // The reference screen for the geometry is always the primary screen, but since

  322.      // we may be in the process of creating and registering the primary screen, we

  323.      // must special-case that and assign it direcly.

  324. -    QCocoaScreen *primaryScreen = (nsScreen == [[NSScreen screens] firstObject]) ?

  325. +    QCocoaScreen *primaryScreen = (nsScreen == [[NSScreen screens] objectAtIndex:0]) ?

  326.          this : static_cast<QCocoaScreen*>(QGuiApplication::primaryScreen()->handle());

  327.  

  328.      m_geometry = primaryScreen->mapFromNative(m_geometry).toRect();

  329. diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm

  330. index e41c70b..815028b 100644

  331. --- a/src/plugins/platforms/cocoa/qcocoamenu.mm

  332. +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm

  333. @@ -329,13 +329,6 @@ void QCocoaMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *

  334.      }

  335.  

  336.      insertNative(cocoaItem, beforeItem);

  337. -

  338. -    // Empty menus on a menubar are hidden by default. If the menu gets

  339. -    // added to the menubar before it contains any item, we need to sync.

  340. -    if (isVisible() && attachedItem().hidden) {

  341. -        if (auto *mb = qobject_cast<QCocoaMenuBar *>(menuParent()))

  342. -            mb->syncMenu(this);

  343. -    }

  344.  }

  345.  

  346.  void QCocoaMenu::insertNative(QCocoaMenuItem *item, QCocoaMenuItem *beforeItem)

  347. diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm

  348. index a4cd465..06d63f7 100644

  349. --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm

  350. +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm

  351. @@ -369,7 +369,7 @@ void QCocoaMenuBar::updateMenuBarImmediately()

  352.      QCocoaMenuLoader *loader = [QCocoaMenuLoader sharedMenuLoader];

  353.      [loader ensureAppMenuInMenu:mb->nsMenu()];

  354.  

  355. -    NSMutableSet *mergedItems = [[NSMutableSet setWithCapacity:mb->merged().count()] retain];

  356. +    NSMutableSet *mergedItems = [[NSMutableSet setWithCapacity:0] retain];

  357.      foreach (QCocoaMenuItem *m, mb->merged()) {

  358.          [mergedItems addObject:m->nsItem()];

  359.          m->syncMerged();

  360. diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm

  361. index 5504c24..fa0b7f7 100644

  362. --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm

  363. +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm

  364. @@ -172,12 +172,11 @@ void *QCocoaNativeInterface::NSPrintInfoForPrintEngine(QPrintEngine *printEngine

  365.  

  366.  QPixmap QCocoaNativeInterface::defaultBackgroundPixmapForQWizard()

  367.  {

  368. +    QCFType<CFURLRef> url;

  369.      const int ExpectedImageWidth = 242;

  370.      const int ExpectedImageHeight = 414;

  371. -    QCFType<CFArrayRef> urls = LSCopyApplicationURLsForBundleIdentifier(

  372. -        CFSTR("com.apple.KeyboardSetupAssistant"), nullptr);

  373. -    if (urls && CFArrayGetCount(urls) > 0) {

  374. -        CFURLRef url = (CFURLRef)CFArrayGetValueAtIndex(urls, 0);

  375. +    if (LSFindApplicationForInfo(kLSUnknownCreator, CFSTR("com.apple.KeyboardSetupAssistant"), 

  376. +                                 0, 0, &url) == noErr) {

  377.          QCFType<CFBundleRef> bundle = CFBundleCreate(kCFAllocatorDefault, url);

  378.          if (bundle) {

  379.              url = CFBundleCopyResourceURL(bundle, CFSTR("Background"), CFSTR("png"), 0);

  380. diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h

  381. index aa8fffd..e6abf49 100644

  382. --- a/src/plugins/platforms/cocoa/qcocoawindow.h

  383. +++ b/src/plugins/platforms/cocoa/qcocoawindow.h

  384. @@ -217,7 +217,9 @@ public:

  385.      Q_NOTIFICATION_HANDLER(NSWindowDidExitFullScreenNotification) void windowDidExitFullScreen();

  386.      Q_NOTIFICATION_HANDLER(NSWindowDidOrderOffScreenNotification) void windowDidOrderOffScreen();

  387.      Q_NOTIFICATION_HANDLER(NSWindowDidOrderOnScreenAndFinishAnimatingNotification) void windowDidOrderOnScreen();

  388. +#if 0

  389.      Q_NOTIFICATION_HANDLER(NSWindowDidChangeOcclusionStateNotification) void windowDidChangeOcclusionState();

  390. +#endif

  391.      Q_NOTIFICATION_HANDLER(NSWindowDidChangeScreenNotification) void windowDidChangeScreen();

  392.      Q_NOTIFICATION_HANDLER(NSWindowWillCloseNotification) void windowWillClose();

  393.  

  394. @@ -316,6 +318,8 @@ public: // for QNSView

  395.      bool m_viewIsEmbedded; // true if the m_view is actually embedded in a "foreign" NSView hiearchy

  396.      bool m_viewIsToBeEmbedded; // true if the m_view is intended to be embedded in a "foreign" NSView hiearchy

  397.  

  398. +    QCocoaWindow *m_parentCocoaWindow;

  399. +

  400.      Qt::WindowFlags m_windowFlags;

  401.      Qt::WindowState m_lastReportedWindowState;

  402.      Qt::WindowModality m_windowModality;

  403. diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm

  404. index 86fd7b8..5d63dea 100644

  405. --- a/src/plugins/platforms/cocoa/qcocoawindow.mm

  406. +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm

  407. @@ -325,7 +325,7 @@ static void qt_closePopups()

  408.  + (void)applicationActivationChanged:(NSNotification*)notification

  409.  {

  410.      const id sender = self;

  411. -    NSEnumerator<NSWindow*> *windowEnumerator = nullptr;

  412. +    NSEnumerator* windowEnumerator = nullptr;

  413.      NSApplication *application = [NSApplication sharedApplication];

  414.  

  415.  #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)

  416. @@ -526,6 +526,7 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw, WId nativeHandle)

  417.      , m_nsWindow(0)

  418.      , m_viewIsEmbedded(false)

  419.      , m_viewIsToBeEmbedded(false)

  420. +    , m_parentCocoaWindow(0)

  421.      , m_lastReportedWindowState(Qt::WindowNoState)

  422.      , m_windowModality(Qt::NonModal)

  423.      , m_windowUnderMouse(false)

  424. @@ -594,10 +595,12 @@ QCocoaWindow::~QCocoaWindow()

  425.      [m_nsWindow makeFirstResponder:nil];

  426.      [m_nsWindow setContentView:nil];

  427.      [m_nsWindow.helper detachFromPlatformWindow];

  428. -    if (m_view.window.parentWindow)

  429. -        [m_view.window.parentWindow removeChildWindow:m_view.window];

  430. -    else if ([m_view superview])

  431. +    if (m_view.window.parentWindow) {

  432. +        if (m_parentCocoaWindow)

  433. +            m_parentCocoaWindow->removeChildWindow(this);

  434. +    } else if ([m_view superview]) {

  435.          [m_view removeFromSuperview];

  436. +    }

  437.  

  438.      removeMonitor();

  439.  

  440. @@ -614,6 +617,7 @@ QCocoaWindow::~QCocoaWindow()

  441.  

  442.      foreachChildNSWindow(^(QCocoaWindow *childWindow) {

  443.          [m_nsWindow removeChildWindow:childWindow->m_nsWindow];

  444. +        childWindow->m_parentCocoaWindow = 0;

  445.      });

  446.  

  447.      [m_view release];

  448. @@ -690,7 +694,7 @@ void QCocoaWindow::setCocoaGeometry(const QRect &rect)

  449.  

  450.      if (isChildNSWindow()) {

  451.          QPlatformWindow::setGeometry(rect);

  452. -        NSWindow *parentNSWindow = m_view.window.parentWindow;

  453. +        NSWindow *parentNSWindow = m_parentCocoaWindow->m_nsWindow;

  454.          NSRect parentWindowFrame = [parentNSWindow contentRectForFrameRect:parentNSWindow.frame];

  455.          clipWindow(parentWindowFrame);

  456.  

  457. @@ -744,7 +748,7 @@ void QCocoaWindow::clipWindow(const NSRect &clipRect)

  458.              m_hiddenByClipping = false;

  459.              if (!m_hiddenByAncestor) {

  460.                  [m_nsWindow orderFront:nil];

  461. -                static_cast<QCocoaWindow *>(QPlatformWindow::parent())->reinsertChildWindow(this);

  462. +                m_parentCocoaWindow->reinsertChildWindow(this);

  463.              }

  464.          }

  465.      }

  466. @@ -781,7 +785,7 @@ void QCocoaWindow::show(bool becauseOfAncestor)

  467.      if ([m_nsWindow isVisible])

  468.          return;

  469.  

  470. -    if (m_view.window.parentWindow && !m_view.window.parentWindow.visible) {

  471. +    if (m_parentCocoaWindow && ![m_parentCocoaWindow->m_nsWindow isVisible]) {

  472.          m_hiddenByAncestor = true; // Parent still hidden, don't show now

  473.      } else if ((becauseOfAncestor == m_hiddenByAncestor) // Was NEITHER explicitly hidden

  474.                 && !m_hiddenByClipping) { // ... NOR clipped

  475. @@ -792,7 +796,7 @@ void QCocoaWindow::show(bool becauseOfAncestor)

  476.          if (!m_hiddenByClipping) { // setCocoaGeometry() can change the clipping status

  477.              [m_nsWindow orderFront:nil];

  478.              if (isChildNSWindow())

  479. -                static_cast<QCocoaWindow *>(QPlatformWindow::parent())->reinsertChildWindow(this);

  480. +                m_parentCocoaWindow->reinsertChildWindow(this);

  481.              foreachChildNSWindow(^(QCocoaWindow *childWindow) {

  482.                  childWindow->show(true);

  483.              });

  484. @@ -854,12 +858,7 @@ void QCocoaWindow::setVisible(bool visible)

  485.              applyWindowState(window()->windowState());

  486.  

  487.              if (window()->windowState() != Qt::WindowMinimized) {

  488. -                if ((window()->modality() == Qt::WindowModal

  489. -                     || window()->type() == Qt::Sheet)

  490. -                        && parentCocoaWindow) {

  491. -                    // show the window as a sheet

  492. -                    [parentCocoaWindow->m_nsWindow beginSheet:m_nsWindow completionHandler:nil];

  493. -                } else if (window()->modality() != Qt::NonModal) {

  494. +                if (window()->modality() != Qt::NonModal) {

  495.                      // show the window as application modal

  496.                      QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());

  497.                      Q_ASSERT(cocoaEventDispatcher != 0);

  498. @@ -919,11 +918,6 @@ void QCocoaWindow::setVisible(bool visible)

  499.                  if (cocoaEventDispatcherPrivate)

  500.                      cocoaEventDispatcherPrivate->endModalSession(window());

  501.                  m_hasModalSession = false;

  502. -            } else {

  503. -                if ([m_nsWindow isSheet]) {

  504. -                    Q_ASSERT_X(parentCocoaWindow, "QCocoaWindow", "Window modal dialog has no transient parent.");

  505. -                    [parentCocoaWindow->m_nsWindow endSheet:m_nsWindow];

  506. -                }

  507.              }

  508.  

  509.              hide();

  510. @@ -1190,7 +1184,7 @@ void QCocoaWindow::raise()

  511.              // -[NSWindow orderFront:] doesn't work with attached windows.

  512.              // The only solution is to remove and add the child window.

  513.              // This will place it on top of all the other NSWindows.

  514. -            NSWindow *parentNSWindow = m_view.window.parentWindow;

  515. +            NSWindow *parentNSWindow = m_parentCocoaWindow->m_nsWindow;

  516.              [parentNSWindow removeChildWindow:m_nsWindow];

  517.              [parentNSWindow addChildWindow:m_nsWindow ordered:NSWindowAbove];

  518.          } else {

  519. @@ -1226,7 +1220,7 @@ void QCocoaWindow::lower()

  520.              // The only solution is to remove and add all the child windows except this one.

  521.              // This will keep the current window at the bottom while adding the others on top of it,

  522.              // hopefully in the same order (this is not documented anywhere in the Cocoa documentation).

  523. -            NSWindow *parentNSWindow = m_view.window.parentWindow;

  524. +            NSWindow *parentNSWindow = m_parentCocoaWindow->m_nsWindow;

  525.              NSArray *children = [parentNSWindow.childWindows copy];

  526.              for (NSWindow *child in children)

  527.                  if (m_nsWindow != child) {

  528. @@ -1528,6 +1522,7 @@ void QCocoaWindow::windowDidOrderOnScreen()

  529.      exposeWindow();

  530.  }

  531.  

  532. +#if 0

  533.  void QCocoaWindow::windowDidChangeOcclusionState()

  534.  {

  535.      // Several unit tests expect paint and/or expose events for windows that are

  536. @@ -1543,6 +1538,7 @@ void QCocoaWindow::windowDidChangeOcclusionState()

  537.          }

  538.      }

  539.  }

  540. +#endif

  541.  

  542.  void QCocoaWindow::windowDidChangeScreen()

  543.  {

  544. @@ -1698,14 +1694,15 @@ void QCocoaWindow::recreateWindowIfNeeded()

  545.  

  546.      qCDebug(lcQpaCocoaWindow) << "Reconfiguring NSWindow due to" << recreateReason;

  547.  

  548. -    QCocoaWindow *parentCocoaWindow = static_cast<QCocoaWindow *>(parentWindow);

  549. +    // FIXME: Replace member with direct parentWindow usage (possibly cast)

  550. +    m_parentCocoaWindow = static_cast<QCocoaWindow *>(parentWindow);

  551.  

  552.      if (shouldBeChildNSWindow) {

  553.          QWindow *parentQWindow = parentWindow->window();

  554.          // Ensure that all parents in the hierarchy are also child NSWindows

  555.          if (!parentQWindow->property("_q_platform_MacUseNSWindow").toBool()) {

  556.              parentQWindow->setProperty("_q_platform_MacUseNSWindow", QVariant(true));

  557. -            parentCocoaWindow->recreateWindowIfNeeded();

  558. +            m_parentCocoaWindow->recreateWindowIfNeeded();

  559.          }

  560.      }

  561.  

  562. @@ -1713,8 +1710,8 @@ void QCocoaWindow::recreateWindowIfNeeded()

  563.      if ((isContentView() && !shouldBeContentView) || (recreateReason & PanelChanged)) {

  564.          qCDebug(lcQpaCocoaWindow) << "Getting rid of existing window" << m_nsWindow;

  565.          [m_nsWindow closeAndRelease];

  566. -        if (isChildNSWindow())

  567. -            [m_view.window.parentWindow removeChildWindow:m_view.window];

  568. +        if (isChildNSWindow() && oldParentCocoaWindow)

  569. +            oldParentCocoaWindow->removeChildWindow(this);

  570.          if (isContentView()) {

  571.              // We explicitly disassociate m_view from the window's contentView,

  572.              // as AppKit does not automatically do this in response to removing

  573. @@ -1730,9 +1727,9 @@ void QCocoaWindow::recreateWindowIfNeeded()

  574.          if (noPreviousWindow)

  575.              m_nsWindow = createNSWindow(shouldBeChildNSWindow, shouldBePanel);

  576.  

  577. -        if (m_view.window.parentWindow) {

  578. -            if (!shouldBeChildNSWindow || (recreateReason & ParentChanged))

  579. -                [m_view.window.parentWindow removeChildWindow:m_view.window];

  580. +        if (oldParentCocoaWindow) {

  581. +            if (!shouldBeChildNSWindow || oldParentCocoaWindow != m_parentCocoaWindow)

  582. +                oldParentCocoaWindow->removeChildWindow(this);

  583.              m_forwardWindow = oldParentCocoaWindow;

  584.          }

  585.  

  586. @@ -1759,8 +1756,8 @@ void QCocoaWindow::recreateWindowIfNeeded()

  587.          setWindowState(window()->windowState());

  588.      } else if (shouldBeChildNSWindow) {

  589.          if (!m_hiddenByClipping) {

  590. -            [parentCocoaWindow->m_nsWindow addChildWindow:m_nsWindow ordered:NSWindowAbove];

  591. -            parentCocoaWindow->reinsertChildWindow(this);

  592. +            [m_parentCocoaWindow->m_nsWindow addChildWindow:m_nsWindow ordered:NSWindowAbove];

  593. +            m_parentCocoaWindow->reinsertChildWindow(this);

  594.          }

  595.  

  596.          // Set properties after the window has been made a child NSWindow

  597. @@ -1771,7 +1768,7 @@ void QCocoaWindow::recreateWindowIfNeeded()

  598.          if ([m_view superview])

  599.              [m_view removeFromSuperview];

  600.  

  601. -        [parentCocoaWindow->m_view addSubview:m_view];

  602. +        [m_parentCocoaWindow->m_view addSubview:m_view];

  603.          QRect rect = windowGeometry();

  604.          // Prevent setting a (0,0) window size; causes opengl context

  605.          // "Invalid Drawable" warnings.

  606. @@ -1915,6 +1912,11 @@ bool QCocoaWindow::alwaysShowToolWindow() const

  607.      return qt_mac_resolveOption(false, window(), "_q_macAlwaysShowToolWindow", "");

  608.  }

  609.  

  610. +void QCocoaWindow::removeChildWindow(QCocoaWindow *child)

  611. +{

  612. +    [m_nsWindow removeChildWindow:child->m_nsWindow];

  613. +}

  614. +

  615.  void QCocoaWindow::removeMonitor()

  616.  {

  617.      if (!monitor)

  618. @@ -2046,12 +2048,14 @@ Qt::WindowState QCocoaWindow::windowState() const

  619.      // FIXME: Support compound states (Qt::WindowStates)

  620.  

  621.      NSWindow *window = m_view.window;

  622. +    /*

  623.      if (window.miniaturized)

  624.          return Qt::WindowMinimized;

  625. +    */

  626.      if (window.qt_fullScreen)

  627.          return Qt::WindowFullScreen;

  628. -    if ((window.zoomed && !isTransitioningToFullScreen())

  629. -        || (m_lastReportedWindowState == Qt::WindowMaximized && isTransitioningToFullScreen()))

  630. +    if (/*(window.zoomed && !isTransitioningToFullScreen())

  631. +        ||*/ (m_lastReportedWindowState == Qt::WindowMaximized && isTransitioningToFullScreen()))

  632.          return Qt::WindowMaximized;

  633.  

  634.      // Note: We do not report Qt::WindowActive, even if isActive()

  635. @@ -2181,7 +2185,6 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)

  636.      if (!m_drawContentBorderGradient) {

  637.          [window setStyleMask:[window styleMask] & ~NSTexturedBackgroundWindowMask];

  638.          [[[window contentView] superview] setNeedsDisplay:YES];

  639. -        window.titlebarAppearsTransparent = NO;

  640.          return;

  641.      }

  642.  

  643. @@ -2206,7 +2209,6 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)

  644.      int effectiveBottomContentBorderThickness = m_bottomContentBorderThickness;

  645.  

  646.      [window setStyleMask:[window styleMask] | NSTexturedBackgroundWindowMask];

  647. -    window.titlebarAppearsTransparent = YES;

  648.  

  649.      [window setContentBorderThickness:effectiveTopContentBorderThickness forEdge:NSMaxYEdge];

  650.      [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];

  651. diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm

  652. index 1e39845..9305566 100644

  653. --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm

  654. +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm

  655. @@ -77,7 +77,7 @@ QT_USE_NAMESPACE

  656.      QPageSetupDialog *dialog = static_cast<QPageSetupDialog *>(contextInfo);

  657.      QPrinter *printer = dialog->printer();

  658.  

  659. -    if (returnCode == NSModalResponseOK) {

  660. +    if (returnCode == NSOKButton) {

  661.          PMPageFormat format = static_cast<PMPageFormat>([printInfo PMPageFormat]);

  662.          PMRect paperRect;

  663.          PMGetUnadjustedPaperRect(format, &paperRect);

  664. @@ -88,7 +88,7 @@ QT_USE_NAMESPACE

  665.          printer->printEngine()->setProperty(QPrintEngine::PPK_Orientation, orientation == kPMLandscape ? QPrinter::Landscape : QPrinter::Portrait);

  666.      }

  667.  

  668. -    dialog->done((returnCode == NSModalResponseOK) ? QDialog::Accepted : QDialog::Rejected);

  669. +    dialog->done((returnCode == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);

  670.  }

  671.  @end

  672.  

  673. diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm

  674. index 8547799..f7bbb59 100644

  675. --- a/src/printsupport/dialogs/qprintdialog_mac.mm

  676. +++ b/src/printsupport/dialogs/qprintdialog_mac.mm

  677. @@ -101,7 +101,7 @@ QT_USE_NAMESPACE

  678.      QPrintDialog *dialog = static_cast<QPrintDialog *>(contextInfo);

  679.      QPrinter *printer = dialog->printer();

  680.  

  681. -    if (returnCode == NSModalResponseOK) {

  682. +    if (returnCode == NSOKButton) {

  683.          PMPrintSession session = static_cast<PMPrintSession>([printInfo PMPrintSession]);

  684.          PMPrintSettings settings = static_cast<PMPrintSettings>([printInfo PMPrintSettings]);

  685.  

  686. @@ -190,7 +190,7 @@ QT_USE_NAMESPACE

  687.          printer->setPageSize(pageSize);

  688.      printer->setOrientation(orientation == kPMLandscape ? QPrinter::Landscape : QPrinter::Portrait);

  689.  

  690. -    dialog->done((returnCode == NSModalResponseOK) ? QDialog::Accepted : QDialog::Rejected);

  691. +    dialog->done((returnCode == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);

  692.  }

  693.  @end

  694.  

  695. diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp

  696. index 4c5c9e1..5b4a95e 100644

  697. --- a/src/testlib/qtestcase.cpp

  698. +++ b/src/testlib/qtestcase.cpp

  699. @@ -147,6 +147,7 @@ static bool debuggerPresent()

  700.          return CFStringCompare(str1, str2, kCFCompareCaseInsensitive) == kCFCompareEqualTo;

  701.      };

  702.  

  703. +#if 0

  704.      // Check if there is an exception handler for the process:

  705.      mach_msg_type_number_t portCount = 0;

  706.      exception_mask_t masks[EXC_TYPES_COUNT];

  707. @@ -163,6 +164,7 @@ static bool debuggerPresent()

  708.              }

  709.          }

  710.      }

  711. +#endif

  712.  

  713.      // Ok, no debugger attached. So, let's see if CrashReporter will throw up a dialog. If so, we

  714.      // leave it to the OS to do the stack trace.

  715. diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm

  716. index e6436f8..db1878a 100644

  717. --- a/src/widgets/styles/qmacstyle_mac.mm

  718. +++ b/src/widgets/styles/qmacstyle_mac.mm

  719. @@ -137,6 +137,21 @@

  720.  #include <qpa/qplatformtheme.h>

  721.  #include <QtGui/private/qcoregraphics_p.h>

  722.  

  723. +@interface NSGraphicsContext (QtAdditions)

  724. +

  725. ++ (NSGraphicsContext *)qt_graphicsContextWithCGContext:(CGContextRef)graphicsPort flipped:(BOOL)initialFlippedState;

  726. +

  727. +@end

  728. +

  729. +@implementation NSGraphicsContext (QtAdditions)

  730. +

  731. ++ (NSGraphicsContext *)qt_graphicsContextWithCGContext:(CGContextRef)graphicsPort flipped:(BOOL)initialFlippedState

  732. +{

  733. +    return [self graphicsContextWithGraphicsPort:graphicsPort flipped:initialFlippedState];

  734. +}

  735. +

  736. +@end

  737. +

  738.  QT_USE_NAMESPACE

  739.  

  740.  static QWindow *qt_getWindow(const QWidget *widget)

  741. @@ -1036,8 +1051,8 @@ void QMacStylePrivate::drawFocusRing(QPainter *p, const QRect &targetRect, int h

  742.              CGContextSetAlpha(ctx, 0.5); // As applied to the stroke color below

  743.  

  744.              [NSGraphicsContext saveGraphicsState];

  745. -            [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:ctx

  746. -                                                                                         flipped:NO]];

  747. +            [NSGraphicsContext setCurrentContext:[NSGraphicsContext qt_graphicsContextWithCGContext:ctx

  748. +                                                                                            flipped:NO]];

  749.              CGRect focusRingRect = CGRectMake(hMargin, vMargin, size, size);

  750.              NSBezierPath *focusRingPath;

  751.              if (radius > 0) {