commit d44186bce4670d2985fb6aba8dba59bbd2c4c77a Author: Jeremy Whiting 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(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(); }