From ab4c22d47d196d5eb28fc16cd7262c77bcb6875f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 3 Apr 2020 12:45:36 +0200 Subject: macOS: Remove all use of deprecated Q_OS_OSX define Change-Id: I49c285604694c93d37c9d1c7cd6d3b1509858319 Reviewed-by: Volker Hilsheimer --- examples/widgets/desktop/systray/window.cpp | 2 +- examples/widgets/mainwindows/mainwindow/mainwindow.cpp | 4 ++-- examples/widgets/richtext/textedit/textedit.cpp | 2 +- examples/widgets/tools/settingseditor/mainwindow.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp index e30166beac..9cfe651669 100644 --- a/examples/widgets/desktop/systray/window.cpp +++ b/examples/widgets/desktop/systray/window.cpp @@ -111,7 +111,7 @@ void Window::setVisible(bool visible) //! [2] void Window::closeEvent(QCloseEvent *event) { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS if (!event->spontaneous() || !isVisible()) { return; } diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp index 4ba180f312..717c75b166 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp @@ -120,7 +120,7 @@ void MainWindow::actionTriggered(QAction *action) void MainWindow::setupToolBar() { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS setUnifiedTitleAndToolBarOnMac(true); #endif @@ -178,7 +178,7 @@ void MainWindow::setupMenuBar() for (int i = 0; i < toolBars.count(); ++i) toolBarMenu->addMenu(toolBars.at(i)->toolbarMenu()); -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS toolBarMenu->addSeparator(); action = toolBarMenu->addAction(tr("Unified")); diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index c9173bcb99..cf3eb47ad8 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -96,7 +96,7 @@ const QString rsrcPath = ":/images/win"; TextEdit::TextEdit(QWidget *parent) : QMainWindow(parent) { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS setUnifiedTitleAndToolBarOnMac(true); #endif setWindowTitle(QCoreApplication::applicationName()); diff --git a/examples/widgets/tools/settingseditor/mainwindow.cpp b/examples/widgets/tools/settingseditor/mainwindow.cpp index ccca16ffcd..225a396f91 100644 --- a/examples/widgets/tools/settingseditor/mainwindow.cpp +++ b/examples/widgets/tools/settingseditor/mainwindow.cpp @@ -157,10 +157,10 @@ void MainWindow::createActions() QAction *openIniFileAct = fileMenu->addAction(tr("Open I&NI File..."), this, &MainWindow::openIniFile); openIniFileAct->setShortcut(tr("Ctrl+N")); -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS QAction *openPropertyListAct = fileMenu->addAction(tr("Open Apple &Property List..."), this, &MainWindow::openPropertyList); openPropertyListAct->setShortcut(tr("Ctrl+P")); -#endif // Q_OS_OSX +#endif // Q_OS_MACOS #ifdef Q_OS_WIN QAction *openRegistryPathAct = fileMenu->addAction(tr("Open Windows &Registry Path..."), this, &MainWindow::openRegistryPath); -- cgit v1.2.3