diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-06-07 02:03:44 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-07 09:25:00 +0000 |
| commit | 474a2a71efaf632f6c0ab60d1c709a949d4a03f2 (patch) | |
| tree | f455223dcc5c1ea68b010f96cedb63c3929711d8 | |
| parent | c9c22f02f1e7a29c129a73d935fde01305de8490 (diff) | |
Replace Q_OS_OSX with Q_OS_MACOS
Change-Id: Idfe9f578372844e8eec22414a8e2c5d5383f2b98
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ec58540cd5ea931d66b25a95704d832d1a85a9c8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/assistant/assistant/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/qdesigner.cpp | 2 | ||||
| -rw-r--r-- | src/linguist/linguist/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/qdbus/qdbusviewer/main.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp index 4ed2f211a..281cd9889 100644 --- a/src/assistant/assistant/mainwindow.cpp +++ b/src/assistant/assistant/mainwindow.cpp @@ -166,7 +166,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent) } while (reader.jumpToNextImage()); qApp->setWindowIcon(appIcon); } -#if !defined(Q_OS_OSX) && !defined(Q_OS_WIN) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN) else { QIcon appIcon(QLatin1String(":/qt-project.org/assistant/images/assistant-128.png")); qApp->setWindowIcon(appIcon); diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp index 3181bd557..fab08021f 100644 --- a/src/designer/src/designer/qdesigner.cpp +++ b/src/designer/src/designer/qdesigner.cpp @@ -60,7 +60,7 @@ QDesigner::QDesigner(int &argc, char **argv) setApplicationName(QLatin1String(designerApplicationName)); QDesignerComponents::initializeResources(); -#if !defined(Q_OS_OSX) && !defined(Q_OS_WIN) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN) setWindowIcon(QIcon(u":/qt-project.org/designer/images/designer.png"_s)); #endif } diff --git a/src/linguist/linguist/mainwindow.cpp b/src/linguist/linguist/mainwindow.cpp index 1e787f54c..6f821cd7d 100644 --- a/src/linguist/linguist/mainwindow.cpp +++ b/src/linguist/linguist/mainwindow.cpp @@ -260,7 +260,7 @@ MainWindow::MainWindow() setUnifiedTitleAndToolBarOnMac(true); m_ui.setupUi(this); -#if !defined(Q_OS_OSX) && !defined(Q_OS_WIN) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN) setWindowIcon(QPixmap(QLatin1String(":/images/appicon.png") )); #endif diff --git a/src/qdbus/qdbusviewer/main.cpp b/src/qdbus/qdbusviewer/main.cpp index b603fbe38..4fd24b2d9 100644 --- a/src/qdbus/qdbusviewer/main.cpp +++ b/src/qdbus/qdbusviewer/main.cpp @@ -15,10 +15,10 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName(u"QDBusViewer"_s); MainWindow mw; -#if !defined(Q_OS_OSX) && !defined(Q_OS_WIN) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN) app.setWindowIcon(QIcon(":/qt-project.org/qdbusviewer/images/qdbusviewer.png"_L1)); #endif -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS mw.setWindowTitle(qApp->translate("QtDBusViewer", "Qt D-Bus Viewer")); #endif |