From 46f9fd7509eaa2809392acf3a264b57a2daf973c Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 12 Jun 2017 11:49:56 +1000 Subject: 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. --- qt/ScintillaEdit/ScintillaEdit.pro | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'qt/ScintillaEdit') 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 { - # 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 \ -- cgit v1.2.3