rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix KConfigXT KComboBox for Qt 4.8 TP1 (upstream patch)

This commit is contained in:
Rex Dieter 2011-06-16 13:52:44 -05:00
parent 3ba22ac8f4
commit a726ab796a
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kdelibs-4.6.80-kconfigxt-qt48.patch Normal file
View File

@ -0,0 +1,33 @@
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();
}

9
kdelibs.spec
View File

@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.6.4
Release: 2%{?dist}
Release: 3%{?dist}
Name: kdelibs
Epoch: 6
@ -99,6 +99,9 @@ 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
## security fix
# Not Upstreamed? why not ? -- Rex
@ -286,6 +289,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch52 -p1 -b .kstatusnotifieritem_dbus_leak
# 4.6 upstream patches
%patch100 -p1 -b .kconfigxt-qt48
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -541,6 +545,9 @@ rm -rf %{buildroot}
%changelog
* Thu Jun 16 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-3
- fix KConfigXT KComboBox for Qt 4.8 TP1 (upstream patch)
* Tue Jun 14 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.4-2
- KStatusNotifierItem leaks D-Bus connections (#667787, kde#261180)