From 9f4ac1f2609a18f6d2ec6cbcd49422724a73e2df Mon Sep 17 00:00:00 2001 From: Le Tan Date: Sun, 25 Jun 2017 18:36:05 +0800 Subject: [PATCH] bug-fix: add Q_OS_MAC for check Qt 5.7 seems to use Q_OS_MAC instead of Q_OS_MACOS. --- src/utils/vvim.cpp | 2 +- src/vmainwindow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/vvim.cpp b/src/utils/vvim.cpp index e7e1e73d..53cf950b 100644 --- a/src/utils/vvim.cpp +++ b/src/utils/vvim.cpp @@ -344,7 +344,7 @@ static int percentageToBlockNumber(const QTextDocument *p_doc, int p_percent) // See if @p_modifiers is Control which is different on macOs and Windows. static bool isControlModifier(int p_modifiers) { -#if defined(Q_OS_MACOS) +#if defined(Q_OS_MACOS) || defined(Q_OS_MAC) return p_modifiers == Qt::MetaModifier; #else return p_modifiers == Qt::ControlModifier; diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp index 4005e8a4..3359117b 100644 --- a/src/vmainwindow.cpp +++ b/src/vmainwindow.cpp @@ -924,7 +924,7 @@ void VMainWindow::initRenderBackgroundMenu(QMenu *menu) tmpAct->setCheckable(true); tmpAct->setData(bgColors[i].name); -#if !defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_MAC) tmpAct->setIcon(QIcon(predefinedColorPixmaps[i])); #endif @@ -1011,7 +1011,7 @@ void VMainWindow::initEditorBackgroundMenu(QMenu *menu) tmpAct->setToolTip(tr("Set as the background color for editor")); tmpAct->setCheckable(true); tmpAct->setData(bgColors[i].name); -#if !defined(Q_OS_MACOS) +#if !defined(Q_OS_MACOS) && !defined(Q_OS_MAC) tmpAct->setIcon(QIcon(predefinedColorPixmaps[i])); #endif if (curBgColor == bgColors[i].name) { @@ -1529,7 +1529,7 @@ QAction *VMainWindow::newAction(const QIcon &p_icon, const QString &p_text, QObject *p_parent) { -#if defined(Q_OS_MACOS) +#if defined(Q_OS_MACOS) || defined(Q_OS_MAC) Q_UNUSED(p_icon); return new QAction(p_text, p_parent); #else