[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-42-g1513b50

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=1513b50

The following commit has been merged in the experimental branch:
commit 1513b5068f4465b3a30f1ff7bcf40229d8527baa
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 29 19:46:07 2012 +0200

    gcc-4.7.diff: remove the applied/fixed parts in 4.8.1
---
 debian/patches/gcc-4.7.diff |   39 +--------------------------------------
 1 files changed, 1 insertions(+), 38 deletions(-)

diff --git a/debian/patches/gcc-4.7.diff b/debian/patches/gcc-4.7.diff
index c77c034..cfafb34 100644
--- a/debian/patches/gcc-4.7.diff
+++ b/debian/patches/gcc-4.7.diff
@@ -3,19 +3,8 @@ Description: Fix build failures with GCC 4.7
  Fix build issues with GCC 4.7, like code wrongly mistaken for operator"".
 Origin: vendor
 Forwarded: no
-Last-Update: 2012-04-17
+Last-Update: 2012-04-29
 
---- a/src/testlib/qxmltestlogger.cpp
-+++ b/src/testlib/qxmltestlogger.cpp
-@@ -119,7 +119,7 @@
-     QTest::qt_asprintf(&buf,
-             "<Environment>
"
-             "    <QtVersion>%s</QtVersion>
"
--            "    <QTestVersion>"QTEST_VERSION_STR"</QTestVersion>
"
-+            "    <QTestVersion>" QTEST_VERSION_STR "</QTestVersion>
"
-             "</Environment>
", qVersion());
-     outputString(buf.constData());
- }
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
 @@ -57,9 +57,7 @@
@@ -41,29 +30,3 @@ Last-Update: 2012-04-17
              JSStaticScopeObjectData()
                  : JSVariableObjectData(&symbolTable, &registerStore + 1)
              {
---- a/src/corelib/kernel/qobjectdefs.h
-+++ b/src/corelib/kernel/qobjectdefs.h
-@@ -216,7 +216,7 @@
- #define QTOSTRING_HELPER(s) #s
- #define QTOSTRING(s) QTOSTRING_HELPER(s)
- #ifndef QT_NO_DEBUG
--# define QLOCATION "

-- 
Qt 4 packaging