aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEdit
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-06-12 11:49:56 +1000
committerNeil <nyamatongwe@gmail.com>2017-06-12 11:49:56 +1000
commit46f9fd7509eaa2809392acf3a264b57a2daf973c (patch)
tree1e3ee8a900c4e4c7768abbe21bfa9acc4043b345 /qt/ScintillaEdit
parent09972b3a179d7ea39ef6ce7e0474531797c549fb (diff)
downloadscintilla-mirror-46f9fd7509eaa2809392acf3a264b57a2daf973c.tar.gz
Removed unused functions and methods from Platform.h.
Replaced Platform::Clamp with Sci::clamp but will later change this to std::clamp once on full C++17 compilers. Drop MouseButtonBounce workaround for very early GTK+/Linux.
Diffstat (limited to 'qt/ScintillaEdit')
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.pro15
1 files changed, 6 insertions, 9 deletions
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index ce0abc39f..9083eced6 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -10,18 +10,14 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = ScintillaEdit
TEMPLATE = lib
CONFIG += lib_bundle
-
-unix {
- # <regex> requires C++11 support
- greaterThan(QT_MAJOR_VERSION, 4){
- CONFIG += c++11
- } else {
- QMAKE_CXXFLAGS += -std=c++0x
- }
-}
+CONFIG += c++14
VERSION = 3.7.5
+win32 {
+ QMAKE_CXXFLAGS += -std:c++latest
+}
+
SOURCES += \
ScintillaEdit.cpp \
ScintillaDocument.cpp \
@@ -48,6 +44,7 @@ SOURCES += \
../../src/EditModel.cxx \
../../src/Document.cxx \
../../src/Decoration.cxx \
+ ../../src/DBCS.cxx \
../../src/ContractionState.cxx \
../../src/CharClassify.cxx \
../../src/CellBuffer.cxx \