diff options
| -rw-r--r-- | recipes-qt4/qt4/qt4-4.8.7.inc | 3 | ||||
| -rw-r--r-- | recipes-qt4/qt4/qt4-4.8.7/0037-fix-configure-with-icu60.patch | 26 | ||||
| -rw-r--r-- | recipes-qt4/qt4/qt4-native.inc | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/recipes-qt4/qt4/qt4-4.8.7.inc b/recipes-qt4/qt4/qt4-4.8.7.inc index 40558aa..d8b178f 100644 --- a/recipes-qt4/qt4/qt4-4.8.7.inc +++ b/recipes-qt4/qt4/qt4-4.8.7.inc @@ -27,6 +27,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever file://0034-Fix-kmap2qmap-build-with-clang.patch \ file://0035-Add-nios2-support.patch \ file://0036-qt-everywhere-opensource-src-4.8.7-gcc6.patch \ + file://0037-fix-configure-with-icu60.patch \ file://gcc-version.patch \ file://Fix-QWSLock-invalid-argument-logs.patch \ file://add_check_for_aarch64_32.patch \ @@ -46,7 +47,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" # workaround for class std::auto_ptr' is deprecated with gcc-6 -CXXFLAGS += "-std=gnu++98 -Wno-deprecated -DUCHAR_TYPE=wchar_t" +CXXFLAGS += "-Wno-deprecated -DUCHAR_TYPE=wchar_t" # disable webkit for mips64 n32 temporarily that fails to compile, # qt upstream defect: diff --git a/recipes-qt4/qt4/qt4-4.8.7/0037-fix-configure-with-icu60.patch b/recipes-qt4/qt4/qt4-4.8.7/0037-fix-configure-with-icu60.patch new file mode 100644 index 0000000..b737f3c --- /dev/null +++ b/recipes-qt4/qt4/qt4-4.8.7/0037-fix-configure-with-icu60.patch @@ -0,0 +1,26 @@ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +index 847f69c358..2360f6259e 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +@@ -234,3 +234,4 @@ SOURCES += \ + SOURCES += wtf/TCSystemAlloc.cpp + } + ++QMAKE_CXXFLAGS += -std=gnu++98 +diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri +index 01f88a485d..384b1ca349 100644 +--- a/src/3rdparty/webkit/Source/WebKit.pri ++++ b/src/3rdparty/webkit/Source/WebKit.pri +@@ -199,3 +199,4 @@ CONFIG(qt_minimal) { + } + + contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools ++QMAKE_CXXFLAGS += -std=gnu++98 +diff --git a/src/plugins/accessible/qaccessiblebase.pri b/src/plugins/accessible/qaccessiblebase.pri +index 95c1fad13a..76693d5fc5 100644 +--- a/src/plugins/accessible/qaccessiblebase.pri ++++ b/src/plugins/accessible/qaccessiblebase.pri +@@ -1,2 +1,3 @@ + target.path += $$[QT_INSTALL_PLUGINS]/accessible + INSTALLS += target ++QMAKE_CXXFLAGS += -std=gnu++98 diff --git a/recipes-qt4/qt4/qt4-native.inc b/recipes-qt4/qt4/qt4-native.inc index 08aa61d..8a672bd 100644 --- a/recipes-qt4/qt4/qt4-native.inc +++ b/recipes-qt4/qt4/qt4-native.inc @@ -30,7 +30,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" # workaround for class std::auto_ptr' is deprecated with gcc-6 -CXXFLAGS += "-std=gnu++98 -Wno-deprecated" +CXXFLAGS += "-Wno-deprecated" EXTRA_OECONF = "-prefix ${prefix} \ -bindir ${bindir} \ |