rpms/qt/devel kde-qt-patches-20091002git.patch,1.1,1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10575

Modified Files:
	kde-qt-patches-20091002git.patch 
Log Message:
remove one already upstreamed part of the patch
(well, it was included in the upstream tarball at least)


kde-qt-patches-20091002git.patch:
 README.kde-qt                                |  164 ++++++++-------
 b/README.kde-qt                              |  189 +++++++++++++++++
 b/bin/syncqt                                 |    6 
 b/configure                                  |    9 
 b/projects.pro                               |    3 
 b/qmake/property.cpp                         |   30 +-
 b/src/corelib/global/qnamespace.h            |   97 ++++++++-
 b/src/corelib/kernel/qobject.cpp             |    8 
 b/src/corelib/kernel/qobject_p.h             |    3 
 b/src/dbus/qdbusinternalfilters.cpp          |   17 +
 b/src/gui/image/qnativeimage.cpp             |   10 
 b/src/gui/image/qnativeimage_p.h             |    1 
 b/src/gui/itemviews/qtreeview.cpp            |    3 
 b/src/gui/kernel/qapplication_x11.cpp        |    7 
 b/src/gui/kernel/qkeymapper_x11.cpp          |  286 ++++++++++++++++++++++-----
 b/src/gui/kernel/qkeysequence.cpp            |  175 ++++++++++++----
 b/src/gui/kernel/qwidget_p.h                 |    1 
 b/src/gui/kernel/qwidget_x11.cpp             |   28 +-
 b/src/gui/painting/qwindowsurface_raster.cpp |   14 -
 b/src/gui/widgets/qmenu.cpp                  |    3 
 b/src/gui/widgets/qtabbar.cpp                |    3 
 b/src/tools/moc/main.cpp                     |    7 
 src/corelib/kernel/qobject_p.h               |    6 
 src/gui/image/qnativeimage.cpp               |    3 
 src/gui/kernel/qkeysequence.cpp              |   21 -
 src/gui/kernel/qwidget_x11.cpp               |   22 +-
 26 files changed, 868 insertions(+), 248 deletions(-)

Index: kde-qt-patches-20091002git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/kde-qt-patches-20091002git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kde-qt-patches-20091002git.patch	2 Oct 2009 13:39:46 -0000	1.1
+++ kde-qt-patches-20091002git.patch	2 Oct 2009 13:52:00 -0000	1.2
@@ -1155,29 +1155,6 @@ index 33aec9e..53f020b 100644
 -- 
 1.6.2.5
 
-From 4b5ae1db24fa1b96f00ef62bd2e1063a8a313e5c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Sat, 27 Jun 2009 14:19:23 +0200
-Subject: [PATCH 14/18] Fix #error line not to have a ' as it's not correct
-
----
- src/3rdparty/webkit/WebCore/DerivedSources.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/3rdparty/webkit/WebCore/DerivedSources.cpp b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
-index f698913..aaf8983 100644
---- a/src/3rdparty/webkit/WebCore/DerivedSources.cpp
-+++ b/src/3rdparty/webkit/WebCore/DerivedSources.cpp
-@@ -334,5 +334,5 @@
- // want StaticConstructors.h to "pollute" all the source files we #include here
- // accidentally, so we'll throw an error whenever any file includes it.
- #ifdef StaticConstructors_h
--#error Don't include any file in DerivedSources.cpp that includes StaticConstructors.h
-+#error Do not include any file in DerivedSources.cpp that includes StaticConstructors.h
- #endif
--- 
-1.6.2.5
-
 From 01f26d0756839fbe783c637ca7dec5b7987f7e14 Mon Sep 17 00:00:00 2001
 From: Aaron Seigo <aseigo at kde.org>
 Date: Mon, 27 Jul 2009 21:46:22 -0600