drop upstreamed qt48 patch

oddly this patch was still applying, though at a large offset, wtf?
This commit is contained in:
Rex Dieter 2011-07-08 14:09:59 -05:00
parent ccfd73b007
commit 814559fc88
2 changed files with 4 additions and 26 deletions

View File

@ -1,21 +0,0 @@
commit d44186bce4670d2985fb6aba8dba59bbd2c4c77a
Author: Jeremy Whiting <jpwhiting@kde.org>
Date: Wed Jun 1 15:49:14 2011 -0600
Fix KComboBox KConfigXT bug when kdelibs is built with qt 4.8.
REVIEW:101486
diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp b/kdeui/dialogs/kconfigdialogmanager.cpp
index 0209f49..a0f6af2 100644
--- a/kdeui/dialogs/kconfigdialogmanager.cpp
+++ b/kdeui/dialogs/kconfigdialogmanager.cpp
@@ -479,9 +479,6 @@ QVariant KConfigDialogManager::property(QWidget *w) const
QByteArray userproperty = getCustomProperty(w);
if (userproperty.isEmpty()) {
- userproperty = getUserProperty(w);
- }
- if (userproperty.isEmpty()) {
QComboBox *cb = qobject_cast<QComboBox *>(w);
if (cb) {
if (cb->isEditable()) {

View File

@ -13,7 +13,7 @@
Summary: KDE Libraries
Version: 4.6.95
Release: 1%{?dist}
Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@ -105,9 +105,6 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
## upstream
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a
# fix KConfigXT KComboBox for Qt 4.8 TP1
Patch100: kdelibs-4.6.90-kconfigxt-qt48.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -301,7 +298,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch51 -p1 -b .uri_mimetypes
# upstream patches
%patch100 -p1 -b .kconfigxt-qt48
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -556,6 +552,9 @@ rm -rf %{buildroot}
%changelog
* Fri Jul 08 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.95-2
- drop upstreamed qt48 patch
* Fri Jul 08 2011 Jaroslav Reznik <jreznik@redhat.com> 4.6.95-1
- 4.6.95 (rc2)