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_p_p.h | |
| 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_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h index bb08c6226e..25ee2e79ce 100644 --- a/src/quick/items/qquicktextinput_p_p.h +++ b/src/quick/items/qquicktextinput_p_p.h @@ -111,8 +111,8 @@ public: , updateType(UpdatePaintNode) , mouseSelectionMode(QQuickTextInput::SelectCharacters) , m_layoutDirection(Qt::LayoutDirectionAuto) - , m_passwordCharacter(qApp->styleHints()->passwordMaskCharacter()) - , m_passwordMaskDelay(qApp->styleHints()->passwordMaskDelay()) + , m_passwordCharacter(QGuiApplication::styleHints()->passwordMaskCharacter()) + , m_passwordMaskDelay(QGuiApplication::styleHints()->passwordMaskDelay()) , focusOnPress(true) , cursorVisible(false) , cursorPending(false) @@ -295,11 +295,11 @@ public: return t->d_func(); } bool hasPendingTripleClick() const { - return !tripleClickTimer.hasExpired(qApp->styleHints()->mouseDoubleClickInterval()); + return !tripleClickTimer.hasExpired(QGuiApplication::styleHints()->mouseDoubleClickInterval()); } void setNativeCursorEnabled(bool enabled) { - setCursorBlinkPeriod(enabled && cursorVisible ? qApp->styleHints()->cursorFlashTime() : 0); } + setCursorBlinkPeriod(enabled && cursorVisible ? QGuiApplication::styleHints()->cursorFlashTime() : 0); } int nextMaskBlank(int pos) { |