6 files changed, 0 insertions, 69 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index 256b7b36ad..72e5798bd6 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -85,10 +85,6 @@ public:
     Qt::KeyboardModifiers queryKeyboardModifiers() const override;
     QList<int> possibleKeys(const QKeyEvent *event) const override;
 
-    void setToolbar(QWindow *window, NSToolbar *toolbar);
-    NSToolbar *toolbar(QWindow *window) const;
-    void clearToolbars();
-
     void setApplicationIcon(const QIcon &icon) const override;
     void setApplicationBadge(qint64 number) override;
 
@@ -120,7 +116,6 @@ private:
 #if QT_CONFIG(vulkan)
     mutable QCocoaVulkanInstance *mCocoaVulkanInstance = nullptr;
 #endif
-    QHash<QWindow *, NSToolbar *> mToolbars;
 
     QCocoaWindowManager m_windowManager;
 };
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 2ec225cbea..6dd410ad22 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -199,8 +199,6 @@ QCocoaIntegration::~QCocoaIntegration()
 #endif
 
     QCocoaScreen::cleanupScreens();
-
-    clearToolbars();
 }
 
 QCocoaIntegration *QCocoaIntegration::instance()
@@ -407,30 +405,6 @@ QList<int> QCocoaIntegration::possibleKeys(const QKeyEvent *event) const
     return mKeyboardMapper->possibleKeys(event);
 }
 
-void QCocoaIntegration::setToolbar(QWindow *window, NSToolbar *toolbar)
-{
-    if (NSToolbar *prevToolbar = mToolbars.value(window))
-        [prevToolbar release];
-
-    [toolbar retain];
-    mToolbars.insert(window, toolbar);
-}
-
-NSToolbar *QCocoaIntegration::toolbar(QWindow *window) const
-{
-    return mToolbars.value(window);
-}
-
-void QCocoaIntegration::clearToolbars()
-{
-    QHash<QWindow *, NSToolbar *>::const_iterator it = mToolbars.constBegin();
-    while (it != mToolbars.constEnd()) {
-        [it.value() release];
-        ++it;
-    }
-    mToolbars.clear();
-}
-
 void QCocoaIntegration::setApplicationIcon(const QIcon &icon) const
 {
     // Fall back to a size that looks good on the highest resolution screen available
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
index 344c8523ce..7f0b05002d 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
@@ -67,12 +67,6 @@ private:
     // Returns true if the given coordinate is inside the current
     // content border.
     static bool testContentBorderPosition(QWindow *window, int position);
-
-    // Sets a NSToolbar instance for the given QWindow. The
-    // toolbar will be attached to the native NSWindow when
-    // that is created;
-   static void setNSToolbar(QWindow *window, void *nsToolbar);
-
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index fd7e1c07b7..80bb504a75 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -71,8 +71,6 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerContentBorderArea);
     if (resource.toLower() == "setcontentborderareaenabled")
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setContentBorderAreaEnabled);
-    if (resource.toLower() == "setnstoolbar")
-        return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setNSToolbar);
     if (resource.toLower() == "testcontentborderposition")
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::testContentBorderPosition);
 
@@ -171,15 +169,6 @@ void QCocoaNativeInterface::setContentBorderAreaEnabled(QWindow *window, quintpt
         cocoaWindow->setContentBorderAreaEnabled(identifier, enable);
 }
 
-void QCocoaNativeInterface::setNSToolbar(QWindow *window, void *nsToolbar)
-{
-    QCocoaIntegration::instance()->setToolbar(window, static_cast<NSToolbar *>(nsToolbar));
-
-    QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
-    if (cocoaWindow)
-        cocoaWindow->updateNSToolbar();
-}
-
 bool QCocoaNativeInterface::testContentBorderPosition(QWindow *window, int position)
 {
     if (!window)
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 0b0e6536c0..1e625ddb9c 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -164,7 +164,6 @@ public:
     void setContentBorderEnabled(bool enable) override;
     bool testContentBorderAreaPosition(int position) const;
     void applyContentBorderThickness(NSWindow *window = nullptr);
-    void updateNSToolbar();
 
     qreal devicePixelRatio() const override;
     QWindow *childWindowAt(QPoint windowPoint);
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 7a0bf5a4cb..e426f459b1 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -1535,11 +1535,6 @@ void QCocoaWindow::recreateWindowIfNeeded()
         setOpacity(opacity);
 
     setMask(QHighDpi::toNativeLocalRegion(window()->mask(), window()));
-
-    // top-level QWindows may have an attached NSToolBar, call
-    // update function which will attach to the NSWindow.
-    if (!parentWindow && !isEmbeddedView)
-        updateNSToolbar();
 }
 
 void QCocoaWindow::requestUpdate()
@@ -1920,21 +1915,6 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
     [[[window contentView] superview] setNeedsDisplay:YES];
 }
 
-void QCocoaWindow::updateNSToolbar()
-{
-    if (!isContentView())
-        return;
-
-    NSToolbar *toolbar = QCocoaIntegration::instance()->toolbar(window());
-    const NSWindow *window = m_view.window;
-
-    if (window.toolbar == toolbar)
-       return;
-
-    window.toolbar = toolbar;
-    window.showsToolbarButton = YES;
-}
-
 bool QCocoaWindow::testContentBorderAreaPosition(int position) const
 {
     if (!m_drawContentBorderGradient || !isContentView())