Contents of /trunk/qt4/patches/qt-4.8.7-icu59-2.patch
Parent Directory | Revision Log
Revision 3149 -
(show annotations)
(download)
Mon Jul 2 08:14:29 2018 UTC (6 years, 2 months ago) by niro
File size: 1117 byte(s)
Mon Jul 2 08:14:29 2018 UTC (6 years, 2 months ago) by niro
File size: 1117 byte(s)
-fedora patch
1 | From: Fabian Vogt <fabian@ritter-vogt.de> |
2 | Subject: Fix build with ICU >= 59 |
3 | |
4 | ICU >= 59 requires C++11 for its header files. |
5 | Qt can't be compiled with -std=c++11 as a whole, so only enable |
6 | it for qlocale_icu.cpp. |
7 | |
8 | Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri |
9 | =================================================================== |
10 | --- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri |
11 | +++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri |
12 | @@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/ |
13 | else:include($$PWD/../../3rdparty/zlib_dependency.pri) |
14 | |
15 | contains(QT_CONFIG,icu) { |
16 | - SOURCES += tools/qlocale_icu.cpp |
17 | + cpp11.name = cpp11 |
18 | + cpp11.input = SOURCES_CPP11 |
19 | + cpp11.dependency_type = TYPE_C |
20 | + cpp11.variable_out = OBJECTS |
21 | + cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)} |
22 | + cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} |
23 | + QMAKE_EXTRA_COMPILERS += cpp11 |
24 | + |
25 | + SOURCES_CPP11 += tools/qlocale_icu.cpp |
26 | DEFINES += QT_USE_ICU |
27 | } |
28 |