summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qcombobox.h
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2012-05-22 07:57:55 +0900
committerQt by Nokia <qt-info@nokia.com>2012-05-23 01:11:30 +0200
commit4d238a5684d2e678c309d0ae8ed7f76a5f2bd682 (patch)
tree52437a4d0aa76fb8dcd794a9c7d8e0b4356ec423 /src/widgets/widgets/qcombobox.h
parent8b78b3a620fac8e7c2219b0a2c3feda9857848fd (diff)
move inputMethodQuery() to public in subclasses of QWidget
QWidget::inputMethodQuery() is public. Change-Id: I6d290e911854937f32fa6984329b56571feb6872 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
-rw-r--r--src/widgets/widgets/qcombobox.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 854ced596b..04736df22f 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -204,6 +204,7 @@ public:
virtual void hidePopup();
bool event(QEvent *event);
+ QVariant inputMethodQuery(Qt::InputMethodQuery) const;
public Q_SLOTS:
void clear();
@@ -237,7 +238,6 @@ protected:
#endif
void contextMenuEvent(QContextMenuEvent *e);
void inputMethodEvent(QInputMethodEvent *);
- QVariant inputMethodQuery(Qt::InputMethodQuery) const;
void initStyleOption(QStyleOptionComboBox *option) const;