From 6b4febd5bb0ccefeeeb2b3bb162348881e58a3de Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Fri, 12 Sep 2014 15:14:29 +0200
Subject: [PATCH] Disable the unified toolbar on OS X in QtWebEngineWidgets
examples
The unified toolbar doesn't work yet with QOpenGLWidget, which we use
to render RenderWidgetHostViewQtDelegateWidget.
Task-number: QTBUG-41179
Change-Id: I5b33d8c06600162974a05bff5fec6e1c7b59e939
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
examples/webenginewidgets/browser/browsermainwindow.cpp | 1 -
examples/webenginewidgets/fancybrowser/mainwindow.cpp | 1 -
2 files changed, 2 deletions(-)
diff --git a/examples/webenginewidgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp
index 85b16580f..eda2b474b 100644
--- a/examples/webenginewidgets/browser/browsermainwindow.cpp
+++ b/examples/webenginewidgets/browser/browsermainwindow.cpp
@@ -467,7 +467,6 @@ void BrowserMainWindow::setupMenu()
void BrowserMainWindow::setupToolBar()
{
- setUnifiedTitleAndToolBarOnMac(true);
m_navigationBar = addToolBar(tr("Navigation"));
connect(m_navigationBar->toggleViewAction(), SIGNAL(toggled(bool)),
this, SLOT(updateToolbarActionText(bool)));
diff --git a/examples/webenginewidgets/fancybrowser/mainwindow.cpp b/examples/webenginewidgets/fancybrowser/mainwindow.cpp
index a5a359350..a311c2651 100644
--- a/examples/webenginewidgets/fancybrowser/mainwindow.cpp
+++ b/examples/webenginewidgets/fancybrowser/mainwindow.cpp
@@ -115,7 +115,6 @@ MainWindow::MainWindow(const QUrl& url)
toolsMenu->addAction(tr("Remove all embedded elements"), this, SLOT(removeEmbeddedElements()));
setCentralWidget(view);
- setUnifiedTitleAndToolBarOnMac(true);
}
//! [3]
--
GitLab