From ef79d4c79ed79404cd6160d0f9c559488baaba74 Mon Sep 17 00:00:00 2001
From: John Ehresman <jpe@wingware.com>
Date: Thu, 1 Dec 2016 10:35:50 -0500
Subject: Bug [#1887]. Define QT_WS_MAC or QT_WS_X11 under qt5 from WS_OS_*
 macros

---
 doc/ScintillaHistory.html                  |  6 +++++-
 qt/ScintillaEditBase/ScintillaEditBase.cpp | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index c1545004d..1e06a9983 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -518,7 +518,7 @@
       </li>
     </ul>
     <h3>
-       <a href="http://www.scintilla.org/scite371.zip">Release 3.7.2</a>
+       <a href="http://www.scintilla.org/scite372.zip">Release 3.7.2</a>
     </h3>
     <ul>
 	<li>
@@ -528,6 +528,10 @@
 	Minimize redrawing for SCI_SETSELECTIONN* APIs.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1888/">Bug #1888</a>.
 	</li>
+	<li>
+	For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>.
+	</li>
     </ul>
     <h3>
        <a href="http://www.scintilla.org/scite371.zip">Release 3.7.1</a>
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
-- 
cgit v1.2.3