From cc7726eda8aadd6421e4b867b013518aee465ae9 Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 28 Jan 2018 08:32:17 +1100 Subject: Allow C++17 in all build and project files. --- qt/ScintillaEdit/ScintillaEdit.pro | 2 +- qt/ScintillaEditBase/ScintillaEditBase.pro | 2 +- qt/ScintillaEditPy/ScintillaEditPy.pro | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qt') diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro index 7fec6e353..3bfffe330 100644 --- a/qt/ScintillaEdit/ScintillaEdit.pro +++ b/qt/ScintillaEdit/ScintillaEdit.pro @@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = ScintillaEdit TEMPLATE = lib CONFIG += lib_bundle -CONFIG += c++14 +CONFIG += c++1z VERSION = 4.0.2 diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro index 987783dc1..792fced9b 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.pro +++ b/qt/ScintillaEditBase/ScintillaEditBase.pro @@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = ScintillaEditBase TEMPLATE = lib CONFIG += lib_bundle -CONFIG += c++14 +CONFIG += c++1z VERSION = 4.0.2 diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro index d5367d379..dce11ccac 100644 --- a/qt/ScintillaEditPy/ScintillaEditPy.pro +++ b/qt/ScintillaEditPy/ScintillaEditPy.pro @@ -6,7 +6,7 @@ TARGET = ScintillaEditPy # Clear debug & release so that sepbuild.pri can set one or the other CONFIG -= debug release -CONFIG += c++14 +CONFIG += c++1z include(sepbuild.pri) @@ -40,7 +40,7 @@ unix:linux-* { # gcc on freebsd 9.2, at least, doesn't support -Wno-empty-body # g++ 7.x has deprecated std::auto_ptr but that is used by code generated by Shiboken so # turn off warning. - QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-empty-body -Wno-deprecated-declarations + QMAKE_CXXFLAGS += -Wno-register -Wno-unused-parameter -Wno-empty-body -Wno-deprecated-declarations --std=gnu++17 LIBS += -ldl } -- cgit v1.2.3