diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-04-07 14:52:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-14 06:46:34 +0200 |
| commit | 480cbb2b00b80baa90676fb3adfa982711006da8 (patch) | |
| tree | 98248d9431071f3e27db2c2aee77c4310d216bfb /examples/webkitwidgets/browser/browsermainwindow.cpp | |
| parent | c9d13139b65818785f218cc96d136d33591ca2f5 (diff) | |
| download | qtwebkit-examples-480cbb2b00b80baa90676fb3adfa982711006da8.tar.gz | |
Fix up tabbed browser example.
* Replaces deprecated Q_WS_MAC preprocessor defines.
* Adds a command line parser.
* Adds Digia Qt home page to the default bookmarks.
* Removes dead Q_WS_QWS flagged code.
Task-number: QTBUG-38069
Change-Id: If4ef67434c76c2ea096fa1250a9ffaa0e53e47dd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'examples/webkitwidgets/browser/browsermainwindow.cpp')
| -rw-r--r-- | examples/webkitwidgets/browser/browsermainwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/webkitwidgets/browser/browsermainwindow.cpp b/examples/webkitwidgets/browser/browsermainwindow.cpp index b94cb25..de988ed 100644 --- a/examples/webkitwidgets/browser/browsermainwindow.cpp +++ b/examples/webkitwidgets/browser/browsermainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the demonstration applications of the Qt Toolkit. @@ -98,7 +98,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 @@ -133,7 +133,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 @@ -278,7 +278,7 @@ void BrowserMainWindow::setupMenu() action->setCheckable(true); fileMenu->addSeparator(); -#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)); @@ -591,7 +591,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)); |