From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Mon, 14 Sep 2020 13:56:35 +0000 (+0100)
Subject: Fix build with ICU >= 59
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-18+rpi1+deb10u1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4a43ea1261f1c102e0322481014c86235dd74ccf;p=qt4-x11.git

Fix build with ICU >= 59

Origin: https://build.opensuse.org/package/view_file/KDE:Qt/libqt4/fix-build-icu59.patch
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898542
Forwarded: not-needed
Reviewd-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

ICU >= 59 requires C++11 for its header files.
Qt can't be compiled with -std=c++11 as a whole, so only enable
it for qlocale_icu.cpp.

Gbp-Pq: Name fix-build-icu59.patch
---

diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 1a7153adf..8d372b4ae 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/../../3rdparty/zlib.pri)
 else:include($$PWD/../../3rdparty/zlib_dependency.pri)
 
 contains(QT_CONFIG,icu) {
-    SOURCES += tools/qlocale_icu.cpp
+    cpp11.name = cpp11
+    cpp11.input = SOURCES_CPP11
+    cpp11.dependency_type = TYPE_C
+    cpp11.variable_out = OBJECTS
+    cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
+    cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+    QMAKE_EXTRA_COMPILERS += cpp11
+
+    SOURCES_CPP11 += tools/qlocale_icu.cpp
     DEFINES += QT_USE_ICU
 }