diff options
author | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
---|---|---|
committer | Fathi Boudra <fabo@debian.org> | 2009-02-20 20:24:25 +0000 |
commit | 7b37d1bc4f6b27188b0688dcdc2b89db3101575c (patch) | |
tree | dccc02bc71441fbb202d0bfd622af264fc33c89f /debian/patches/16_hide_std_symbols_on_qtwebkit.diff | |
parent | 6ad728b38295ae6479662a58b8c640f389bfa607 (diff) | |
download | qt4-x11-debian/4.5.0-rc1-1.tar.gz |
Merge Qt4 4.5 branch to trunk.debian/4.5.0-rc1-1
Diffstat (limited to 'debian/patches/16_hide_std_symbols_on_qtwebkit.diff')
-rw-r--r-- | debian/patches/16_hide_std_symbols_on_qtwebkit.diff | 14 |
1 files changed, 7 insertions, 7 deletions
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 @@ |