From 0e7236cacf17b5881f873ca0a34525815545daf2 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 26 Jan 2016 09:31:50 +1100 Subject: Fix flags to be compatible with Qt 4.x. --- qt/ScintillaEditBase/PlatQt.cpp | 7 +++++-- 1 file 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 -- cgit v1.2.3