From dcc0fbcf61a9f2a12798b78a1e5d836d906e3b7e Mon Sep 17 00:00:00 2001
From: Neil Hodgson <unknown>
Date: Thu, 28 Apr 2016 16:07:24 +1000
Subject: 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.

---
 qt/ScintillaEditPy/ScintillaEditPy.pro | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'qt/ScintillaEditPy')

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
-- 
cgit v1.2.3