diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-01-26 09:31:50 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-01-26 09:31:50 +1100 |
| commit | 0e7236cacf17b5881f873ca0a34525815545daf2 (patch) | |
| tree | b83da8f2164f11caa2a8e16a162ff28067dfd602 | |
| parent | 71c673f7511f4f7f890ffe7ded65a0cf0cec3836 (diff) | |
| download | scintilla-mirror-0e7236cacf17b5881f873ca0a34525815545daf2.tar.gz | |
Fix flags to be compatible with Qt 4.x.
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index d97414198..bdcb0a6dc 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -819,8 +819,11 @@ void ListBoxImpl::Create(Window &parent, #if defined(Q_OS_WIN) // On Windows, Qt::ToolTip causes a crash when the list is clicked on // so Qt::Tool is used. - list->setParent(0, Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | - Qt::WindowDoesNotAcceptFocus); + list->setParent(0, Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + | Qt::WindowDoesNotAcceptFocus +#endif + ); #else // On OS X, Qt::Tool takes focus so main window loses focus so // keyboard stops working. Qt::ToolTip works but its only really |