[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Bug in kcfg, KColorCombo not handled correct
From:       Dag Andersen <danders () get2net ! dk>
Date:       2011-11-03 8:47:45
Message-ID: 201111030947.45929.danders () get2net ! dk
[Download RAW message or body]

AFAICS this commit:
8e95387f0d96ceb8439339643d1b9286a9204662
broke kcfg handling of KColorCombo.

The attached patch fixes it for me.

-- 
Mvh.
Dag Andersen

["color.diff" (text/x-patch)]

diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp b/kdeui/dialogs/kconfigdialogmanager.cpp
index 0890c0b..ac56e59 100644
--- a/kdeui/dialogs/kconfigdialogmanager.cpp
+++ b/kdeui/dialogs/kconfigdialogmanager.cpp
@@ -447,7 +447,7 @@ void KConfigDialogManager::setProperty(QWidget *w, const QVariant &v)
   }*/
 
     QByteArray userproperty = getCustomProperty(w);
-    if (userproperty.isEmpty()) {
+    if (userproperty.isEmpty() && w->metaObject()->className() == QByteArray("QComboBox")) {
         QComboBox *cb = qobject_cast<QComboBox *>(w);
         if (cb) {
             if (cb->isEditable()) {
@@ -481,7 +481,7 @@ QVariant KConfigDialogManager::property(QWidget *w) const
     return QVariant(bg->id(bg->checkedButton()));*/
 
     QByteArray userproperty = getCustomProperty(w);
-    if (userproperty.isEmpty()) {
+    if (userproperty.isEmpty() && w->metaObject()->className() == QByteArray("QComboBox")) {
         QComboBox *cb = qobject_cast<QComboBox *>(w);
         if (cb) {
             if (cb->isEditable()) {


[prev in list] [next in list] [prev in thread] [next in thread]