[SCM] QtWebKit packaging branch, experimental, updated. debian/2.2.1-7-42-g782f170

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=b179a66

The following commit has been merged in the experimental branch:
commit b179a669fd7522d498a4eeb84e641f095f47145c
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 21:49:33 2014 +0200

    Refresh patch: 04_enable_debug_information.diff
---
 debian/patches/04_enable_debug_information.diff | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/04_enable_debug_information.diff b/debian/patches/04_enable_debug_information.diff
index bf63cfb..35095cd 100644
--- a/debian/patches/04_enable_debug_information.diff
+++ b/debian/patches/04_enable_debug_information.diff
@@ -6,14 +6,14 @@ Author: Fathi Boudra <fabo at debian.org>
  Source/JavaScriptCore/JavaScriptCore.pro |    2 --
  1 file changed, 2 deletions(-)
 
---- a/Source/JavaScriptCore/JavaScriptCore.pro
-+++ b/Source/JavaScriptCore/JavaScriptCore.pro
-@@ -24,8 +24,6 @@ unix:contains(QT_CONFIG, reduce_relocati
- 
- CONFIG(QTDIR_build) {
-     # Remove the following 2 lines if you want debug information in JavaScriptCore
--    CONFIG -= separate_debug_info
--    CONFIG += no_debug_info
- }
- 
- *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
+--- a/Tools/qmake/mkspecs/features/production_build.prf
++++ b/Tools/qmake/mkspecs/features/production_build.prf
+@@ -9,8 +9,6 @@
+ # symbols for the static libraries that implement API.
+ linux-*|win32-g++*:if(CONFIG(debug, debug|release)|contains(QT_CONFIG,separate_debug_info)):contains(TEMPLATE, lib):staticlib {
+     !equals(TARGET, WebKit2):!equals(TARGET, WebKit1) {
+-        CONFIG += no_debug_info
+-        CONFIG -= separate_debug_info
+         QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE
+         QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE
+     }

-- 
QtWebKit packaging