From 335d1ee72b5e9156e9afc9bb4914430bec7dd215 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Mon, 14 Sep 2020 14:56:35 +0100 Subject: [PATCH] Don't make the std:: symbols in webkit public. Solution based on the work of Mike Hommey in the gtk webkit package. Author: Sune Vuorela Gbp-Pq: Name 16_hide_std_symbols_on_qtwebkit.diff --- src/3rdparty/webkit/Source/WebKit.pri | 2 ++ src/3rdparty/webkit/Source/symbols.filter | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 src/3rdparty/webkit/Source/symbols.filter diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri index 01f88a485..64c6bd80f 100644 --- a/src/3rdparty/webkit/Source/WebKit.pri +++ b/src/3rdparty/webkit/Source/WebKit.pri @@ -100,6 +100,8 @@ win32-g++* { CONFIG -= warn_on *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self +*-g++*:QMAKE_LFLAGS += -Wl,--version-script,$$PWD/symbols.filter + # Treat warnings as errors on x86/Linux/GCC linux-g++* { !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror diff --git a/src/3rdparty/webkit/Source/symbols.filter b/src/3rdparty/webkit/Source/symbols.filter new file mode 100644 index 000000000..f5af6bac9 --- /dev/null +++ b/src/3rdparty/webkit/Source/symbols.filter @@ -0,0 +1,5 @@ +{ +local: +_ZSt*; +_ZNSt*; +}; -- 2.30.2