diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-06-15 13:20:47 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-06-15 13:22:33 +0200 |
| commit | 173cdff56c57e19921386c13c7c17457ad5b67c4 (patch) | |
| tree | 56baf6dfbf4e35a7ad73b331770b9d177bec0bfa /src/plugins/qmlinspector | |
| parent | 4f45855188e282c8c958fcfb39a886720d885683 (diff) | |
| parent | 83dba068ce27a2f74301abce8facab0bb2035c91 (diff) | |
| download | qt-creator-173cdff56c57e19921386c13c7c17457ad5b67c4.tar.gz | |
Merge branch '2.0'
Conflicts:
src/plugins/cppeditor/cppquickfix.cpp
src/plugins/mercurial/mercurialjobrunner.cpp
src/plugins/subversion/subversionplugin.cpp
Diffstat (limited to 'src/plugins/qmlinspector')
| -rw-r--r-- | src/plugins/qmlinspector/components/expressionquerywidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp index 4aa2f1b7c9..830ce28756 100644 --- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp +++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp @@ -283,7 +283,7 @@ bool ExpressionQueryWidget::eventFilter(QObject *obj, QEvent *event) bool atLastLine = !(cursor.block().next().isValid()); if (!atLastLine) return true; - if (cursor.columnNumber() <= m_prompt.count()) + if (cursor.positionInBlock() <= m_prompt.count()) return true; cursor.deletePreviousChar(); m_expr = cursor.block().text().mid(m_prompt.count()); |