Merge remote-tracking branch 'origin/f15' into f14

.gitignore

@@ -1,3 +1 @@
-/kdelibs-4.6.2.tar.bz2
-/kdelibs-4.6.3.tar.bz2
-/kdelibs-4.6.4.tar.bz2
+/kdelibs-4.6.5.tar.bz2

kdelibs-4.6.80-kconfigxt-qt48.patch

@@ -1,33 +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()) {
-@@ -490,6 +487,11 @@ QVariant KConfigDialogManager::property(QWidget *w) const
-                 return QVariant(cb->currentIndex());
-             }
-         }
-+    }
-+    if (userproperty.isEmpty()) {
-+        userproperty = getUserProperty(w);
-+    }
-+    if (userproperty.isEmpty()) {
-         kWarning(d->debugArea()) << w->metaObject()->className() << " widget not handled!";
-         return QVariant();
-     }

kdelibs.spec

@@ -15,8 +15,8 @@
 %define halectomy 1
 
 Summary: KDE Libraries
-Version: 4.6.4
-Release: 6%{?dist}
+Version: 4.6.5
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -101,9 +101,6 @@ Patch51: kdelibs-4.6.2-uri_mimetypes.patch
 Patch52: kdelibs-4.6.80-kstatusnotifieritem_dbus_leak.patch
 
 ## 4.6 upstream
-# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a
-# fix KConfigXT KComboBox for Qt 4.8 TP1
-Patch100: kdelibs-4.6.80-kconfigxt-qt48.patch
 # fix docbook-style-xsl borkage
 Patch101: kdelibs-4.6.4-kdoctools_docbook.patch 
 # http://bugzilla.redhat.com/667787
@@ -290,7 +287,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch51 -p1 -b .uri_mimetypes
 
 # 4.6 upstream patches
-%patch100 -p1 -b .kconfigxt-qt48
 %patch101 -p1 -b .kdoctools_docbook
 %patch102 -p1 -b .kstatusnotifieritemdbus_leak
 
@@ -548,6 +544,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 01 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.5-1
+- 4.6.5
+
 * Thu Jun 30 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-6
 - better (upstream) fix for kstatusnotifieritemdbus leak (#667787, kde#261180)
 

sources

@@ -1 +1 @@
-d38a8bf5b2002f9014727cec4395ba2a  kdelibs-4.6.4.tar.bz2
+8ca933c00bb5089e0793756e69bd1275  kdelibs-4.6.5.tar.bz2