commit 3e7d5b071de7fcb2de150856044f2e287466321d
Author: Koji Yokota <[email protected]>
Date: Fri Oct 30 19:46:23 2026 +0900
Macro 'Q_OS_MAC' has been marked as deprecated in Qt 6.12.0.
All appearance of macro 'Q_OS_MAC' is changed to 'Q_OS_MACOS'.
Since the latter is defined from Qt 5.8 (< 5.9.4 minimum requirement of
LyX),
backward compatibility is satisfied.
---
src/Format.cpp | 2 +-
src/frontends/qt/CategorizedCombo.cpp | 2 +-
src/frontends/qt/FindAndReplace.cpp | 2 +-
src/frontends/qt/GuiApplication.cpp | 18 +++++++++---------
src/frontends/qt/GuiCharacter.cpp | 2 +-
src/frontends/qt/GuiClipboard.cpp | 14 +++++++-------
src/frontends/qt/GuiFontLoader.cpp | 2 +-
src/frontends/qt/GuiFontMetrics.cpp | 2 +-
src/frontends/qt/GuiKeySymbol.cpp | 6 +++---
src/frontends/qt/GuiParagraph.cpp | 2 +-
src/frontends/qt/GuiPrefs.cpp | 2 +-
src/frontends/qt/GuiSpellchecker.cpp | 2 +-
src/frontends/qt/GuiView.cpp | 14 +++++++-------
src/frontends/qt/GuiWorkArea.cpp | 10 +++++-----
src/frontends/qt/LayoutBox.cpp | 2 +-
src/frontends/qt/Menus.cpp | 14 +++++++-------
src/frontends/qt/qt_helpers.cpp | 2 +-
17 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/Format.cpp b/src/Format.cpp
index 3f8cf0867e..5ea49e6b43 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -37,7 +37,7 @@
#include <map>
#include <ctime>
-// FIXME: Q_OS_MAC is not available, it's in Qt
+// FIXME: Q_OS_MACOS is not available, it's in Qt
#ifdef USE_MACOSX_PACKAGING
#include "support/linkback/LinkBackProxy.h"
#endif
diff --git a/src/frontends/qt/CategorizedCombo.cpp
b/src/frontends/qt/CategorizedCombo.cpp
index cc34559c0c..573b7d8045 100644
--- a/src/frontends/qt/CategorizedCombo.cpp
+++ b/src/frontends/qt/CategorizedCombo.cpp
@@ -436,7 +436,7 @@ bool CategorizedCombo::eventFilter(QObject * o, QEvent * e)
void CategorizedCombo::setIconSize(QSize size)
{
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
bool small = size.height() < 20;
setAttribute(Qt::WA_MacSmallSize, small);
setAttribute(Qt::WA_MacNormalSize, !small);
diff --git a/src/frontends/qt/FindAndReplace.cpp
b/src/frontends/qt/FindAndReplace.cpp
index a1d8ef406d..8f9745c723 100644
--- a/src/frontends/qt/FindAndReplace.cpp
+++ b/src/frontends/qt/FindAndReplace.cpp
@@ -667,7 +667,7 @@ FindAndReplace::FindAndReplace(GuiView & parent,
setFocusProxy(widget_);
// FIXME: Allow all areas once the dialog re-orientation is fixed
setAllowedAreas(Qt::DockWidgetAreas(Qt::LeftDockWidgetArea |
Qt::RightDockWidgetArea));
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// On Mac show and floating
setFloating(true);
#endif
diff --git a/src/frontends/qt/GuiApplication.cpp
b/src/frontends/qt/GuiApplication.cpp
index 5fef08dc53..25204088b2 100644
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -77,7 +77,7 @@
#include "support/Package.h"
#include "support/TempFile.h"
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
#include "support/AppleScript.h"
#include "support/AppleSupport.h"
#include "support/linkback/LinkBackProxy.h"
@@ -156,7 +156,7 @@ using QWindowsApplication =
QNativeInterface::Private::QWindowsApplication;
# include <objidl.h>
#endif
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
# if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
# include <QtGui/QUtiMimeConverter>
# define QMACMIME QUtiMimeConverter
@@ -164,7 +164,7 @@ using QWindowsApplication =
QNativeInterface::Private::QWindowsApplication;
# include <QMacPasteboardMime>
# define QMACMIME QMacPasteboardMime
# endif
-#endif // Q_OS_MAC
+#endif // Q_OS_MACOS
#include <exception>
#include <sstream>
@@ -185,7 +185,7 @@ frontend::Application * createApplication(int & argc, char
* argv[])
// Setup high DPI handling. This is a bit complicated, but will be default in
Qt6.
// macOS does it by itself.
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_OS_MAC)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_OS_MACOS)
// Attribute Qt::AA_EnableHighDpiScaling must be set before
QCoreApplication is created
if (getEnv("QT_ENABLE_HIGHDPI_SCALING").empty()
&& getEnv("QT_AUTO_SCREEN_SCALE_FACTOR").empty())
@@ -1157,7 +1157,7 @@ GuiApplication * guiApp;
GuiApplication::~GuiApplication()
{
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
closeAllLinkBackLinks();
#endif
delete d;
@@ -1205,7 +1205,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
if (lyxrc.quit_on_last_window_closed)
setQuitOnLastWindowClosed(false);
*/
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// FIXME: Do we need a lyxrc setting for this on Mac? This behaviour
// seems to be the default case for applications like LyX.
setQuitOnLastWindowClosed(false);
@@ -2541,7 +2541,7 @@ void GuiApplication::processKeySym(KeySymbol const &
keysym, KeyModifier state)
// The keysym is either not text or it is different
// from the non-modifier keysym. See #9875 for the
// broken alt-modifier effect of having this code
active.
-#if !defined(Q_OS_MAC)
+#if !defined(Q_OS_MACOS)
// If a non-Shift Modifier is used we have a non-bound
key sequence
// (such as Alt+j = j). This should be omitted (#5575).
// On Windows, AltModifier and ControlModifier are both
@@ -2890,7 +2890,7 @@ void GuiApplication::execBatchCommands()
// Gives some error box here.
return;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
setAttribute(Qt::AA_MacDontSwapCtrlAndMeta,lyxrc.mac_dontswap_ctrl_meta);
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
setAttribute(Qt::AA_UseHighDpiPixmaps,true);
@@ -3028,7 +3028,7 @@ QFont const GuiApplication::typewriterSystemFont()
if (!isFixedPitch(font)) font.setFamily("courier");
}
}
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// On a Mac the result is too small and it's not practical to
// rely on Qtconfig utility to change the system settings of Qt.
font.setPointSize(12);
diff --git a/src/frontends/qt/GuiCharacter.cpp
b/src/frontends/qt/GuiCharacter.cpp
index 6510f6ea44..03802baf17 100644
--- a/src/frontends/qt/GuiCharacter.cpp
+++ b/src/frontends/qt/GuiCharacter.cpp
@@ -230,7 +230,7 @@ GuiCharacter::GuiCharacter(GuiView & lv)
connect(resetdefault_, SIGNAL(triggered()), this,
SLOT(resetToDefault()));
connect(resetnochange_, SIGNAL(triggered()), this,
SLOT(resetToNoChange()));
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// On Mac it's common to have tool windows which are always in the
// foreground and are hidden when the main window is not focused.
setWindowFlags(Qt::Tool);
diff --git a/src/frontends/qt/GuiClipboard.cpp
b/src/frontends/qt/GuiClipboard.cpp
index fd4e9c0e6b..7579c4a88b 100644
--- a/src/frontends/qt/GuiClipboard.cpp
+++ b/src/frontends/qt/GuiClipboard.cpp
@@ -30,9 +30,9 @@
#include "support/lstrings.h"
#include "support/lyxtime.h"
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
#include "support/linkback/LinkBackProxy.h"
-#endif // Q_OS_MAC
+#endif // Q_OS_MACOS
#include "frontends/alert.h"
@@ -318,7 +318,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur,
GraphicsType type) cons
// write the (LinkBack) PDF data
f.write(ar);
if (type == LinkBackGraphicsType) {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
void const * linkBackData;
unsigned linkBackLen;
getLinkBackData(&linkBackData, &linkBackLen);
@@ -329,7 +329,7 @@ FileName GuiClipboard::getAsGraphics(Cursor const & cur,
GraphicsType type) cons
#else
// only non-Mac this should never happen
LATTEST(false);
-#endif // Q_OS_MAC
+#endif // Q_OS_MACOS
}
f.close();
@@ -494,11 +494,11 @@ bool
GuiClipboard::hasGraphicsContents(Clipboard::GraphicsType type) const
// handle LinkBack for Mac
if (type == LinkBackGraphicsType)
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
return isLinkBackDataInPasteboard();
#else
return false;
-#endif // Q_OS_MAC
+#endif // Q_OS_MACOS
// get mime data
QStringList const & formats = cache_.formats();
@@ -545,7 +545,7 @@ bool GuiClipboard::hasInternal() const
// are notified of changes. However, on Windows ownership is
// emulated by Qt through the OleIsCurrentClipboard() API, while
// on macOS we deal with this issue by ourself.
-#ifndef Q_OS_MAC
+#ifndef Q_OS_MACOS
return true;
#else
return false;
diff --git a/src/frontends/qt/GuiFontLoader.cpp
b/src/frontends/qt/GuiFontLoader.cpp
index ee76554797..2cdf1f6d0d 100644
--- a/src/frontends/qt/GuiFontLoader.cpp
+++ b/src/frontends/qt/GuiFontLoader.cpp
@@ -362,7 +362,7 @@ bool FontLoader::available(FontInfo const & f)
static vector<int> cache(NUM_FAMILIES, false);
FontFamily family = f.family();
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// Apple ships a font name "Symbol", which has more or less the same
// glyphs as the original PostScript Symbol font, but it uses a
different
// encoding (see
https://en.wikipedia.org/wiki/Symbol_(typeface)#cite_note-2).
diff --git a/src/frontends/qt/GuiFontMetrics.cpp
b/src/frontends/qt/GuiFontMetrics.cpp
index 4fe4c6150d..4e89c0020e 100644
--- a/src/frontends/qt/GuiFontMetrics.cpp
+++ b/src/frontends/qt/GuiFontMetrics.cpp
@@ -80,7 +80,7 @@ int const strdim_cache_max_cost = 1024 * 1024;
// Limit breakstr_cache_ total cost to 10MB of string data.
// This is useful for documents with very large insets.
int const breakstr_cache_max_cost = 10 * 1024 * 1024;
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
// For some reason, the built-in cache of QTextLayout does not work or
// exist on macOS.
// Limit qtextlayout_cache_ size to 500 elements (we do not know the
diff --git a/src/frontends/qt/GuiKeySymbol.cpp
b/src/frontends/qt/GuiKeySymbol.cpp
index 5bff8343c8..b904f9b835 100644
--- a/src/frontends/qt/GuiKeySymbol.cpp
+++ b/src/frontends/qt/GuiKeySymbol.cpp
@@ -11,7 +11,7 @@
#include <config.h>
#include "GuiKeySymbol.h"
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
#include "GuiApplication.h"
#endif
#include "qt_helpers.h"
@@ -801,7 +801,7 @@ docstring const KeySymbol::print(KeyModifier mod, bool
forgui, bool untranslated
str = untranslated ? seq.toString(QKeySequence::PortableText)
: seq.toString(QKeySequence::NativeText);
else {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// Qt/Mac does not use Command and friends in the
// portable case, but the windows-like Control+x (bug 5421).
str = seq.toString(QKeySequence::NativeText);
@@ -841,7 +841,7 @@ bool KeySymbol::operator==(KeySymbol const & ks) const
KeyModifier q_key_state(Qt::KeyboardModifiers state)
{
KeyModifier k = NoModifier;
-#if defined(Q_OS_MAC) && (QT_VERSION < QT_VERSION_CHECK(5, 12, 0))
+#if defined(Q_OS_MACOS) && (QT_VERSION < QT_VERSION_CHECK(5, 12, 0))
/// Additional check for Control and Meta modifier swap state.
/// Starting with Qt 5 the modifiers aren't reported correctly.
/// Until this is fixed a correction is required.
diff --git a/src/frontends/qt/GuiParagraph.cpp
b/src/frontends/qt/GuiParagraph.cpp
index 4de971f214..40745f9648 100644
--- a/src/frontends/qt/GuiParagraph.cpp
+++ b/src/frontends/qt/GuiParagraph.cpp
@@ -62,7 +62,7 @@ GuiParagraph::GuiParagraph(GuiView & lv)
connect(labelWidth, SIGNAL(textChanged(QString)),
this, SLOT(changed()));
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// On Mac it's common to have tool windows which are always in the
// foreground and are hidden when the main window is not focused.
setWindowFlags(Qt::Tool);
diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index 65f6d16d93..fdd0b46da2 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -345,7 +345,7 @@ PrefInput::PrefInput(GuiPreferences * form)
keymapLangCO->setModelColumn(0);
// reveal checkbox for switching Ctrl and Meta on Mac:
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
dontswapCB->setVisible(true);
#else
dontswapCB->setVisible(false);
diff --git a/src/frontends/qt/GuiSpellchecker.cpp
b/src/frontends/qt/GuiSpellchecker.cpp
index 1092f9ade3..c30f7ce3a5 100644
--- a/src/frontends/qt/GuiSpellchecker.cpp
+++ b/src/frontends/qt/GuiSpellchecker.cpp
@@ -621,7 +621,7 @@ GuiSpellchecker::GuiSpellchecker(GuiView & parent,
widget_ = new SpellcheckerWidget(&parent, this);
setWidget(widget_);
setFocusProxy(widget_);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// On Mac show and floating
setFloating(true);
#endif
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 36df8c7b16..f04fbb7784 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -625,7 +625,7 @@ GuiView::GuiView(int id)
// Fill up the menu bar.
guiApp->menus().fillMenuBar(menuBar(), this, true);
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
connect(guiApp, &GuiApplication::keyCommandStateSet, this, [this]() {
d.blockMenuKeyEquivalents(guiApp->isInCommandMode());
});
@@ -649,7 +649,7 @@ GuiView::GuiView(int id)
// We don't want to keep the window in memory if it is closed.
setAttribute(Qt::WA_DeleteOnClose, true);
-#if !(defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)) && !defined(Q_OS_MAC)
+#if !(defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)) && !defined(Q_OS_MACOS)
// assign an icon to main form. We do not do it under Qt/Win or Qt/Mac,
// since the icon is provided in the application bundle. We use a themed
// version when available and use the bundled one as fallback.
@@ -662,7 +662,7 @@ GuiView::GuiView(int id)
// (such as "source" and "messages")
setDockOptions(QMainWindow::ForceTabbedDocks);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// use document mode tabs on docks
setDocumentMode(true);
#endif
@@ -1818,7 +1818,7 @@ void GuiView::on_lastWorkAreaRemoved()
return;
}
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// On Mac we also close the last window because the application stay
// resident in memory. On other platforms we don't close the last
// window because this would quit the application.
@@ -2000,9 +2000,9 @@ bool GuiView::event(QEvent * e)
#else
// Pre 6.8: OS-dependent
// 1. macOS
- // Limit to Q_OS_MAC as this unnecessarily would also
+ // Limit to Q_OS_MACOS as this unnecessarily would also
// trigger on Linux with grave performance issues
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
case QEvent::ApplicationPaletteChange: {
// We need to update metrics here to avoid a crash (#12786)
theBufferList().changed(true);
@@ -2559,7 +2559,7 @@ bool GuiView::getStatus(FuncRequest const & cmd,
FuncStatus & flag)
Buffer * doc_buffer = documentBufferView()
? &(documentBufferView()->buffer()) : nullptr;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
/* In LyX/Mac, when a dialog is open, the menus of the
application can still be accessed without giving focus to
the main window. In this case, we want to disable the menu
diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp
index 1a04ea313c..adc0ce4565 100644
--- a/src/frontends/qt/GuiWorkArea.cpp
+++ b/src/frontends/qt/GuiWorkArea.cpp
@@ -51,7 +51,7 @@
#include <QContextMenuEvent>
#include <QHelpEvent>
#include <QInputMethod>
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
#include <QProxyStyle>
#include "support/AppleSupport.h"
#endif
@@ -341,7 +341,7 @@ void GuiWorkArea::startBlinkingCaret()
if (!lyxerr.debugging(Debug::PAINTING)) {
// we are not supposed to cache this value.
int time = QApplication::cursorFlashTime() / 2;
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
int const cursor_time_on = NSTextInsertionPointBlinkPeriodOn();
int const cursor_time_off =
NSTextInsertionPointBlinkPeriodOff();
if (cursor_time_on > 0 && cursor_time_off > 0) {
@@ -1610,7 +1610,7 @@ TabWorkArea::TabWorkArea(QWidget * parent)
this, SLOT(closeTab(int)));
setUsesScrollButtons(true);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// use document mode tabs
setDocumentMode(true);
#endif
@@ -2232,7 +2232,7 @@ void TabWorkArea::updateTabTexts()
tab_text += "*";
QString tab_tooltip = it->abs();
if (buf.hasReadonlyFlag()) {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
QLabel * readOnlyButton = new QLabel();
QIcon icon = QIcon(getPixmap("images/",
"emblem-readonly", "svgz,png"));
readOnlyButton->setPixmap(icon.pixmap(QSize(16, 16)));
@@ -2242,7 +2242,7 @@ void TabWorkArea::updateTabTexts()
#endif
tab_tooltip = qt_("%1 (read only)").arg(tab_tooltip);
} else
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
tabBar()->setTabButton(tab_index, QTabBar::RightSide,
0);
#else
setTabIcon(tab_index, QIcon());
diff --git a/src/frontends/qt/LayoutBox.cpp b/src/frontends/qt/LayoutBox.cpp
index 1cc6476a30..a230c7a527 100644
--- a/src/frontends/qt/LayoutBox.cpp
+++ b/src/frontends/qt/LayoutBox.cpp
@@ -459,7 +459,7 @@ bool LayoutBox::eventFilter(QObject * o, QEvent * e)
void LayoutBox::setIconSize(QSize size)
{
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
bool small = size.height() < 20;
setAttribute(Qt::WA_MacSmallSize, small);
setAttribute(Qt::WA_MacNormalSize, !small);
diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp
index f676d8e2ce..e630235bbd 100644
--- a/src/frontends/qt/Menus.cpp
+++ b/src/frontends/qt/Menus.cpp
@@ -89,7 +89,7 @@ using namespace lyx::support;
namespace lyx {
namespace frontend {
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
// Defined in MenusMacOS.mm. Shows the key bindings appended to the labels of
// the native menu items of \p qmenu (and its submenus) in a dimmed color.
void greyOutBindings(QMenu * qmenu);
@@ -2353,7 +2353,7 @@ static QString label(MenuItem const & mi, MenuDefinition
const & menu,
}
if (!binding.isEmpty()) {
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
// Strings after '\t' are automatically registered as a shortcut
// in macOS which causes a problem in two-stroke shortcuts
// https://www.lyx.org/trac/ticket/13284
@@ -2399,7 +2399,7 @@ void Menu::Impl::populate(QMenu * qMenu, MenuDefinition
const & menu)
QString const binding = m.binding();
QString const lbl = label(m, menu, binding);
Action * act = new Action(m.func(), QIcon(), lbl,
m.tooltip(), qMenu);
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
// used by greyOutBindings() to locate the binding in
the title
if (!binding.isEmpty())
act->setProperty("lyx_binding",
lbl.section('\t', 1));
@@ -2455,7 +2455,7 @@ Menu::~Menu()
void Menu::updateView()
{
guiApp->menus().updateMenu(this);
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
greyOutBindings(this);
#endif
}
@@ -2909,7 +2909,7 @@ bool Menus::searchMenu(FuncRequest const & func,
void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
{
if (initial) {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// setup special mac specific menu items, but only do this
// the first time a QMenuBar is created. Otherwise Qt will
// create duplicate items in the application menu. It seems
@@ -2919,7 +2919,7 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view,
bool initial)
} else {
// Clear all menubar contents before filling it.
qmb->clear();
-#if (defined(Q_OS_MAC))
+#if (defined(Q_OS_MACOS))
d->macMenuBarInit(qmb);
#endif
}
@@ -2959,7 +2959,7 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view,
bool initial)
Menu * menuptr = new Menu(view, m.submenuname(), true);
menuptr->setTitle(label(m, menu, QString()));
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
// On Mac OS with Qt/Cocoa, the menu is not displayed if there
is no action
// so we create a temporary one here
QAction * action = new QAction(menuptr);
diff --git a/src/frontends/qt/qt_helpers.cpp b/src/frontends/qt/qt_helpers.cpp
index 4246f74042..7fc99b917d 100644
--- a/src/frontends/qt/qt_helpers.cpp
+++ b/src/frontends/qt/qt_helpers.cpp
@@ -490,7 +490,7 @@ QStringList texFileList(QString const & filename)
QString const externalLineEnding(docstring const & str)
{
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
// The MAC clipboard uses \r for lineendings, and we use \n
return toqstr(subst(str, '\n', '\r'));
#elif defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
