diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-10-06 11:56:27 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-10-06 12:28:24 +0200 |
| commit | 283616e923dd680047ccf37303864b6807cc42c2 (patch) | |
| tree | 27f43b230eff269d4f7ef9fae60eb0e29d75936d /examples/webenginewidgets/browser/browsermainwindow.cpp | |
| parent | 7188e0cc439417eebedf0cc7c12d5944ab35ddf4 (diff) | |
Examples: Replace deprecated Q_WS_MAC defines with Q_OS_OSX.
Change-Id: I2d9f23a9aa8871df7b3054628a2db49ea858c522
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'examples/webenginewidgets/browser/browsermainwindow.cpp')
| -rw-r--r-- | examples/webenginewidgets/browser/browsermainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/webenginewidgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp index eda2b474b..ae40c7418 100644 --- a/examples/webenginewidgets/browser/browsermainwindow.cpp +++ b/examples/webenginewidgets/browser/browsermainwindow.cpp @@ -114,7 +114,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) QVBoxLayout *layout = new QVBoxLayout; layout->setSpacing(0); layout->setMargin(0); -#if defined(Q_WS_MAC) +#if defined(Q_OS_OSX) layout->addWidget(m_bookmarksToolbar); layout->addWidget(new QWidget); // <- OS X tab widget style bug #else @@ -151,7 +151,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags) m_navigationBar, SLOT(setVisible(bool))); connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)), m_bookmarksToolbar, SLOT(setVisible(bool))); -#if defined(Q_WS_MAC) +#if defined(Q_OS_OSX) connect(m_tabWidget, SIGNAL(lastTabClosed()), this, SLOT(close())); #else @@ -302,7 +302,7 @@ void BrowserMainWindow::setupMenu() fileMenu->addSeparator(); #endif -#if defined(Q_WS_MAC) +#if defined(Q_OS_OSX) fileMenu->addAction(tr("&Quit"), BrowserApplication::instance(), SLOT(quitBrowser()), QKeySequence(Qt::CTRL | Qt::Key_Q)); #else fileMenu->addAction(tr("&Quit"), this, SLOT(close()), QKeySequence(Qt::CTRL | Qt::Key_Q)); @@ -620,7 +620,7 @@ void BrowserMainWindow::slotUpdateWindowTitle(const QString &title) if (title.isEmpty()) { setWindowTitle(tr("Qt Demo Browser")); } else { -#if defined(Q_WS_MAC) +#if defined(Q_OS_OSX) setWindowTitle(title); #else setWindowTitle(tr("%1 - Qt Demo Browser", "Page title and Browser name").arg(title)); |