AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move inputMethodQuery() to public in subclasses of QWidget

Browse Source 
QWidget::inputMethodQuery() is public.

Change-Id: I6d290e911854937f32fa6984329b56571feb6872
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
This commit is contained in:
Tasuku Suzuki 2012-05-22 07:57:55 +09:00 committed by Qt by Nokia
parent 8b78b3a620
commit 4d238a5684
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qcombobox.h
View File

@ -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;

2
src/widgets/widgets/qplaintextedit.h
View File

@ -179,6 +179,7 @@ public:
void print(QPagedPaintDevice *printer) const;
int blockCount() const;
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
public Q_SLOTS:
@ -249,7 +250,6 @@ protected:
virtual void insertFromMimeData(const QMimeData *source);
virtual void inputMethodEvent(QInputMethodEvent *);
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
QPlainTextEdit(QPlainTextEditPrivate &dd, QWidget *parent);

3
src/widgets/widgets/qtextedit.h
View File

@ -206,6 +206,8 @@ public:
void print(QPagedPaintDevice *printer) const;
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
public Q_SLOTS:
void setFontPointSize(qreal s);
void setFontFamily(const QString &fontFamily);
@ -290,7 +292,6 @@ protected:
virtual void insertFromMimeData(const QMimeData *source);
virtual void inputMethodEvent(QInputMethodEvent *);
QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
QTextEdit(QTextEditPrivate &dd, QWidget *parent);