diff options
author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:16:18 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-06 11:16:18 +0000 |
commit | 85c4904ec8d29ad8074bebef880ffe362ea3241e (patch) | |
tree | b4b832881482f89cd2f7a2b05ece9d19162cb642 /src/quick/items/qquicktextinput.cpp | |
parent | b049085a2c13abe9cf89308d02a90b9a0be6cde1 (diff) | |
parent | a005dcb57eb2938032c3e4c983ea04472190455c (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 91e6bf9615..24260c3150 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -543,7 +543,7 @@ Qt::LayoutDirection QQuickTextInputPrivate::layoutDirection() const direction = textDirection(); #ifndef QT_NO_IM if (direction == Qt::LayoutDirectionAuto) - direction = qApp->inputMethod()->inputDirection(); + direction = QGuiApplication::inputMethod()->inputDirection(); #endif } return (direction == Qt::LayoutDirectionAuto) ? Qt::LeftToRight : direction; @@ -556,7 +556,7 @@ bool QQuickTextInputPrivate::determineHorizontalAlignment() Qt::LayoutDirection direction = textDirection(); #ifndef QT_NO_IM if (direction == Qt::LayoutDirectionAuto) - direction = qApp->inputMethod()->inputDirection(); + direction = QGuiApplication::inputMethod()->inputDirection(); #endif return setHAlign(direction == Qt::RightToLeft ? QQuickTextInput::AlignRight : QQuickTextInput::AlignLeft); } @@ -727,7 +727,7 @@ void QQuickTextInput::setCursorVisible(bool on) if (on && isComponentComplete()) QQuickTextUtil::createCursor(d); if (!d->cursorItem) { - d->setCursorBlinkPeriod(on ? qApp->styleHints()->cursorFlashTime() : 0); + d->setCursorBlinkPeriod(on ? QGuiApplication::styleHints()->cursorFlashTime() : 0); d->updateType = QQuickTextInputPrivate::UpdatePaintNode; polish(); update(); @@ -1570,7 +1570,7 @@ void QQuickTextInput::mousePressEvent(QMouseEvent *event) d->selectPressed = true; QPointF distanceVector = d->pressPos - d->tripleClickStartPoint; if (d->hasPendingTripleClick() - && distanceVector.manhattanLength() < qApp->styleHints()->startDragDistance()) { + && distanceVector.manhattanLength() < QGuiApplication::styleHints()->startDragDistance()) { event->setAccepted(true); selectAll(); return; @@ -1599,7 +1599,7 @@ void QQuickTextInput::mouseMoveEvent(QMouseEvent *event) Q_D(QQuickTextInput); if (d->selectPressed) { - if (qAbs(int(event->localPos().x() - d->pressPos.x())) > qApp->styleHints()->startDragDistance()) + if (qAbs(int(event->localPos().x() - d->pressPos.x())) > QGuiApplication::styleHints()->startDragDistance()) setKeepMouseGrab(true); #ifndef QT_NO_IM @@ -1651,7 +1651,7 @@ bool QQuickTextInputPrivate::sendMouseEventToInputContext(QMouseEvent *event) int mousePos = tmp_cursor - m_cursor; if (mousePos >= 0 && mousePos <= m_textLayout.preeditAreaText().length()) { if (event->type() == QEvent::MouseButtonRelease) { - qApp->inputMethod()->invokeAction(QInputMethod::Click, mousePos); + QGuiApplication::inputMethod()->invokeAction(QInputMethod::Click, mousePos); } return true; } @@ -2599,7 +2599,7 @@ void QQuickTextInputPrivate::handleFocusEvent(QFocusEvent *event) #ifndef QT_NO_IM if (focusOnPress && !m_readOnly) qGuiApp->inputMethod()->show(); - q->connect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + q->connect(QGuiApplication::inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), q, SLOT(q_updateAlignment())); #endif } else { @@ -2617,7 +2617,7 @@ void QQuickTextInputPrivate::handleFocusEvent(QFocusEvent *event) emit q->editingFinished(); #ifndef QT_NO_IM - q->disconnect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + q->disconnect(QGuiApplication::inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), q, SLOT(q_updateAlignment())); #endif } @@ -3058,7 +3058,7 @@ void QQuickTextInputPrivate::commitPreedit() if (!hasImState) return; - qApp->inputMethod()->commit(); + QGuiApplication::inputMethod()->commit(); if (!hasImState) return; @@ -3074,7 +3074,7 @@ void QQuickTextInputPrivate::cancelPreedit() if (!hasImState) return; - qApp->inputMethod()->reset(); + QGuiApplication::inputMethod()->reset(); QInputMethodEvent ev; QCoreApplication::sendEvent(q, &ev); |