diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-04-12 21:27:57 -0400 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2013-04-15 14:51:17 +0200 |
| commit | a42a41d9049d660c26a76d5433e26d01b8e41911 (patch) | |
| tree | c3d9916aff81be737b4fb32dbd2691f342d97a47 /examples | |
| parent | ba55c6c541b15813ee1c6621cec4a7f1276a2ecf (diff) | |
Rename QMacUnifiedToolBar -> QMacNativeToolBar.
All NSToolbars are drawn in unified style since OS X 10.5 and this
cannot be changed. Plus, the unified style is a window mask, which has
more to do with NSWindow than NSToolbar.
In light of this, using the term "native" makes more sense.
Change-Id: I6f1fb4c0dc853290c68aab30092bcf5136493883
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/macunifiedtoolbar/preferenceswindow.cpp | 2 | ||||
| -rw-r--r-- | examples/macunifiedtoolbar/window.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/macunifiedtoolbar/preferenceswindow.cpp b/examples/macunifiedtoolbar/preferenceswindow.cpp index a3cc04a..c10f937 100644 --- a/examples/macunifiedtoolbar/preferenceswindow.cpp +++ b/examples/macunifiedtoolbar/preferenceswindow.cpp @@ -41,7 +41,7 @@ #include "preferenceswindow.h" #include "ui_preferenceswindow.h" -#include "qmacunifiedtoolbar.h" +#include <QMacNativeToolBar> #include <QTimer> PreferencesWindow::PreferencesWindow(QWidget *parent) : diff --git a/examples/macunifiedtoolbar/window.cpp b/examples/macunifiedtoolbar/window.cpp index da33cdb..6a61612 100644 --- a/examples/macunifiedtoolbar/window.cpp +++ b/examples/macunifiedtoolbar/window.cpp @@ -42,7 +42,7 @@ #include "window.h" #include "ui_window.h" #include "preferenceswindow.h" -#include "qmacunifiedtoolbar.h" +#include <QMacNativeToolBar> #include <QDesktopWidget> #include <QMenuBar> #include <QTimer> @@ -52,7 +52,7 @@ class WindowPrivate public: PreferencesWindow *preferencesWindow; QMenuBar *mainMenuBar; - QMacUnifiedToolBar *toolBar; + QMacNativeToolBar *toolBar; }; Window::Window(QWidget *parent) : @@ -68,7 +68,7 @@ Window::Window(QWidget *parent) : QMenu *toolsMenu = d->mainMenuBar->addMenu("Tools"); toolsMenu->addAction("Options", d->preferencesWindow, SLOT(show())); - d->toolBar = new QMacUnifiedToolBar(this); + d->toolBar = new QMacNativeToolBar(this); d->toolBar->addAction(QIcon(":/qtlogo.png"), "Hello"); d->toolBar->addAction(QIcon(":/qtlogo.png"), "World"); d->toolBar->addStandardItem(QMacToolButton::FlexibleSpace); |