diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-21 13:44:33 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-09-25 11:01:04 +0200 |
| commit | 89fa7823b3fd48d1d26b2c85be04619cf1a99f28 (patch) | |
| tree | 8831d2d8d3ad5947742c8b38bf2d9bd3e0485dbf /src/plugins/qmljseditor | |
| parent | aef4280bc1594118c2b75cfb1af1061585f0120f (diff) | |
| download | qt-creator-89fa7823b3fd48d1d26b2c85be04619cf1a99f28.tar.gz | |
Replace all remaining functions deprecated in Qt 5, if possible.
These are:
- QInputDialog::getInteger() [-> getInt()]
- QKeySequence::operator QString() [-> toString()]
- QRegion::intersect() [-> intersected()]
- qVariantCanConvert() [-> QVariant::canConvert()]
Plus some left-over occurrences of qFindChild() and
QAbstractItemModel::reset() that were missed by the
respective earlier patches.
All deprecated features still left are not trivially
replaceable, i.e. the code using them cannot be made
to compile with both Qt 4 and Qt 5.
Change-Id: I32541681bbf66b0fef78f5c7025521f9ff84f463
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/quicktoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 919a4d8011..e8ee5c8c6f 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -214,7 +214,7 @@ void QuickToolBar::apply(TextEditor::BaseTextEditor *editor, Document::Ptr docum rect.setHeight(widget()->height() + 10); rect.setWidth(reg.boundingRect().width() - reg.boundingRect().left()); rect.moveTo(reg.boundingRect().topLeft()); - reg = reg.intersect(rect); + reg = reg.intersected(rect); if (contextWidget()->acceptsType(m_prototypes)) { m_node = 0; |