diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2013-04-26 11:09:03 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2013-04-26 11:09:03 +1000 |
| commit | 559adda730c48c611f0ae746daa936bf7e00027a (patch) | |
| tree | 9fda75d820a66d1090ac0e8b23a2e5939df27db6 | |
| parent | b389cfbe111e544b63b6a808a674643399dd1001 (diff) | |
| download | scintilla-mirror-559adda730c48c611f0ae746daa936bf7e00027a.tar.gz | |
QInputContext is no longer available in Qt 5.
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 822eb1adb..245049164 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -13,7 +13,9 @@ #include "PlatQt.h" #include <QApplication> +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include <QInputContext> +#endif #include <QPainter> #include <QScrollBar> #include <QTextFormat> diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index e65390f4a..03e3b42b3 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -17,7 +17,9 @@ #include <QApplication> #include <QDrag> +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include <QInputContext> +#endif #include <QMimeData> #include <QMenu> #include <QScrollBar> |