aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditPy
diff options
context:
space:
mode:
authorNeil Hodgson <unknown>2016-04-28 16:07:24 +1000
committerNeil Hodgson <unknown>2016-04-28 16:07:24 +1000
commitdcc0fbcf61a9f2a12798b78a1e5d836d906e3b7e (patch)
tree2f51fafb74f363ff89d66858ee36b988220ec721 /qt/ScintillaEditPy
parent474aab1c941497ae8275289bb0d7e5a214faeb2f (diff)
downloadscintilla-mirror-dcc0fbcf61a9f2a12798b78a1e5d836d906e3b7e.tar.gz
Fixes for problems with C++11 <regex>.
For Qt on Unix, set to build as C++11. Avoid deprecation warnings in PySide. For GTK+ allow turning off C++11 <regex> with make NO_CXX11_REGEX=1.
Diffstat (limited to 'qt/ScintillaEditPy')
-rw-r--r--qt/ScintillaEditPy/ScintillaEditPy.pro9
1 files changed, 9 insertions, 0 deletions
diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro
index 9b0040782..49f7fb0f2 100644
--- a/qt/ScintillaEditPy/ScintillaEditPy.pro
+++ b/qt/ScintillaEditPy/ScintillaEditPy.pro
@@ -11,6 +11,15 @@ include(sepbuild.pri)
VERSION = $$SCINTILLA_VERSION
+unix {
+ # <regex> requires C++11 support
+ greaterThan(QT_MAJOR_VERSION, 4){
+ CONFIG += c++11
+ } else {
+ QMAKE_CXXFLAGS += -std=c++0x -Wno-deprecated-declarations
+ }
+}
+
win32 {
DebugBuild {
TARGET_EXT = _d.pyd