summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qcombobox_p.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-05-20 13:25:27 +0200
committerOlivier Goffart <ogoffart@trolltech.com>2009-05-20 13:47:58 +0200
commitfdefbb820f1ebf9fbde0f683ea6d05923e8c04e4 (patch)
tree5dac0f832a8ce60f1724d9978b604df64fd3e5f3 /src/gui/widgets/qcombobox_p.h
parent25f86fbab2e7d23832b0bb8ae8530289258e2aa5 (diff)
QComboBox: style change event should not resets custom item delegates
Regression from 4.4 introduced while fixing task 167106 Autotest: tst_QComboBox::task253944_itemDelegateIsReset() Task-number: 253944 Reviewed-by: jbache
Diffstat (limited to 'src/gui/widgets/qcombobox_p.h')
-rw-r--r--src/gui/widgets/qcombobox_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h
index c39a23140c..a55b439e8d 100644
--- a/src/gui/widgets/qcombobox_p.h
+++ b/src/gui/widgets/qcombobox_p.h
@@ -256,7 +256,7 @@ private:
};
class QComboMenuDelegate : public QAbstractItemDelegate
-{
+{ Q_OBJECT
public:
QComboMenuDelegate(QObject *parent, QComboBox *cmb) : QAbstractItemDelegate(parent), mCombo(cmb) {}
@@ -285,7 +285,7 @@ private:
// Vista does not use the new theme for combo boxes and there might
// be other side effects from using the new class
class QComboBoxDelegate : public QItemDelegate
-{
+{ Q_OBJECT
public:
QComboBoxDelegate(QObject *parent, QComboBox *cmb) : QItemDelegate(parent), mCombo(cmb) {}
@@ -367,7 +367,7 @@ public:
int itemRole() const;
void updateLayoutDirection();
void setCurrentIndex(const QModelIndex &index);
- void updateDelegate();
+ void updateDelegate(bool force = false);
void keyboardSearchString(const QString &text);
void modelChanged();