From 7b37d1bc4f6b27188b0688dcdc2b89db3101575c Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Fri, 20 Feb 2009 20:24:25 +0000 Subject: Merge Qt4 4.5 branch to trunk. --- debian/patches/16_hide_std_symbols_on_qtwebkit.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'debian/patches/16_hide_std_symbols_on_qtwebkit.diff') diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff index 3ecbd99..c54b5ba 100644 --- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff +++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff @@ -1,13 +1,13 @@ --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri -@@ -27,6 +27,7 @@ CONFIG(release) { +@@ -26,6 +26,7 @@ CONFIG(release) { + BASE_DIR = $$PWD - qt-port:INCLUDEPATH += \ - $$PWD/WebKit/qt/Api -+qt-port:QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter - gtk-port:INCLUDEPATH += \ - $$BASE_DIR/WebCore/platform/gtk \ - $$BASE_DIR/WebCore/platform/network/curl \ + INCLUDEPATH += $$PWD/WebKit/qt/Api ++QMAKE_LFLAGS += -Wl,--version-script,$$BASE_DIR/symbols.filter + + # + # For builds inside Qt we interpret the output rule and the input of each extra compiler manually --- /dev/null +++ b/src/3rdparty/webkit/symbols.filter @@ -0,0 +1,5 @@ -- cgit v1.2.3