diff options
| author | Neil Hodgson <unknown> | 2021-08-17 08:27:32 +1000 |
|---|---|---|
| committer | Neil Hodgson <unknown> | 2021-08-17 08:27:32 +1000 |
| commit | 557bea24106e3868d2b5c5c4b066575c5236538a (patch) | |
| tree | 0f463fa960c9f852a5d4a8ae0b9a85ec5eed4f42 | |
| parent | fdd749210d8a813332d8789634b8c82aae14e9d7 (diff) | |
| download | scintilla-mirror-557bea24106e3868d2b5c5c4b066575c5236538a.tar.gz | |
Make compile on older Qt 5.9.5 on Ubuntu 18.04 with gcc 7.5.0.
Was complaining about enum conversions.
| -rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 2d49dcb5c..3887e44a5 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -1000,7 +1000,7 @@ void ListBoxImpl::Create(Window &parent, // keyboard stops working. Qt::ToolTip works but its only really // documented for tooltips. // On Linux / X this setting allows clicking on list items. - list->setParent(nullptr, Qt::ToolTip | Qt::FramelessWindowHint); + list->setParent(nullptr, static_cast<Qt::WindowFlags>(Qt::ToolTip | Qt::FramelessWindowHint)); #endif list->setAttribute(Qt::WA_ShowWithoutActivating); list->setFocusPolicy(Qt::NoFocus); diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index 383f32c10..0713d4226 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -665,7 +665,7 @@ void ScintillaQt::StartDrag() QDrag *dragon = new QDrag(scrollArea); dragon->setMimeData(mimeData); - Qt::DropAction dropAction = dragon->exec(Qt::CopyAction|Qt::MoveAction); + Qt::DropAction dropAction = dragon->exec(static_cast<Qt::DropActions>(Qt::CopyAction|Qt::MoveAction)); if ((dropAction == Qt::MoveAction) && dropWentOutside) { // Remove dragged out text ClearSelection(); |