diff options
| author | John Ehresman <jpe@wingware.com> | 2016-12-01 10:35:50 -0500 |
|---|---|---|
| committer | John Ehresman <jpe@wingware.com> | 2016-12-01 10:35:50 -0500 |
| commit | ef79d4c79ed79404cd6160d0f9c559488baaba74 (patch) | |
| tree | fa7a76f05107842130cb03256d056b22f5dc8078 /qt/ScintillaEditBase/ScintillaEditBase.cpp | |
| parent | b5d9addc5beea11472d05cd12a3540e243c998bf (diff) | |
| download | scintilla-mirror-ef79d4c79ed79404cd6160d0f9c559488baaba74.tar.gz | |
Bug [#1887]. Define QT_WS_MAC or QT_WS_X11 under qt5 from WS_OS_* macros
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaEditBase.cpp')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 762cf8820..eb51ef1d1 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -29,6 +29,17 @@ #define SC_INDICATOR_CONVERTED INDIC_IME+2 #define SC_INDICATOR_UNKNOWN INDIC_IME_MAX +// Q_WS_MAC and Q_WS_X11 aren't defined in Qt5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#ifdef Q_OS_MAC +#define Q_WS_MAC 1 +#endif + +#if !defined(Q_OS_MAC) && !defined(Q_OS_WIN) +#define Q_WS_X11 1 +#endif +#endif // QT_VERSION >= 5.0.0 + #ifdef SCI_NAMESPACE using namespace Scintilla; #endif |