diff options
| author | Andrew den Exter <andrew.den.exter@jollamobile.com> | 2012-11-22 11:11:29 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 00:08:56 +0100 |
| commit | b2165ea510293f9841570ed9572512ca3f048ae0 (patch) | |
| tree | 8daa8f32164e63af09dcb32ce7b8a51ea07003a8 /src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | |
| parent | 497978e6c2d7602448ca6fd8dd8da32813c6705b (diff) | |
Port TextInput/TextEdit clipboard optimizations from QtQuick 2.0
Don't check if the clipboard has content until necessary as the
check can block for an extended period.
Port of 3db5afa71443533eee6825a5fb0da29498f96b94 from qtdeclarative.
Change-Id: I606af79cbf10b147aa1bb6c182b0a84aabbc5257
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h index 13325f63..554fbc12 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h @@ -76,8 +76,8 @@ public: mouseSelectionMode(QDeclarativeTextInput::SelectCharacters), inputMethodHints(Qt::ImhNone), hscroll(0), oldScroll(0), oldValidity(false), focused(false), focusOnPress(true), showInputPanelOnFocus(true), clickCausedFocus(false), cursorVisible(false), - autoScroll(true), selectByMouse(false), canPaste(false), hAlignImplicit(true), - selectPressed(false) + autoScroll(true), selectByMouse(false), canPaste(false), canPasteValid(false) + , hAlignImplicit(true), selectPressed(false) { } @@ -134,7 +134,8 @@ public: bool cursorVisible:1; bool autoScroll:1; bool selectByMouse:1; - bool canPaste:1; + mutable bool canPaste:1; + mutable bool canPasteValid:1; bool hAlignImplicit:1; bool selectPressed:1; |