mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 18:08:10 +00:00
Cmake build with qt6 on MAC
Patch from P. De Visschere Citing: I also must exclude the QMacPasteboardMimeGraphics class in GuiApplication.cpp since QMacPasteboard is not available anymore with qt6. and add an #include <QStandardPaths> in support/Package.cpp (I suppose this will pose no problem for qt5 but have not checked it, it's only needed with USE_MACOSX_PACKAGING)
This commit is contained in:
parent
4671214f3d
commit
a9b0f5faae
@ -153,7 +153,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#if defined(Q_OS_MAC) && (QT_VERSION < 0x060000)
|
||||
#include <QMacPasteboardMime>
|
||||
#endif // Q_OS_MAC
|
||||
|
||||
@ -752,7 +752,7 @@ public:
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#if defined(Q_OS_MAC) && (QT_VERSION < 0x060000)
|
||||
// QMacPasteboardMimeGraphics can only be compiled on Mac.
|
||||
|
||||
class QMacPasteboardMimeGraphics : public QMacPasteboardMime
|
||||
@ -1048,7 +1048,7 @@ struct GuiApplication::Private
|
||||
Qt::ApplicationState last_state_;
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#if defined(Q_OS_MAC) && (QT_VERSION < 0x060000)
|
||||
/// Linkback mime handler for MacOSX.
|
||||
QMacPasteboardMimeGraphics mac_pasteboard_mime_;
|
||||
#endif
|
||||
|
@ -43,6 +43,7 @@
|
||||
# include "support/qstring_helpers.h"
|
||||
# include <QDir>
|
||||
# include <QDesktopServices>
|
||||
# include <QStandardPaths>
|
||||
#endif
|
||||
|
||||
using namespace std;
|
||||
|
Loading…
Reference in New Issue
Block a user