diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 16:25:58 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-05-10 11:53:47 +0200 |
| commit | 66646dd8c37adb488a79ab274b2396a649674e6d (patch) | |
| tree | b0f5ac752a52cec3de1d47692e09295197622dcd /src/quick/items/qquicktextinput_p.h | |
| parent | da15ea0f3b5805db657f13060c21efa78f10cde2 (diff) | |
| parent | d82a17b929dd88fe76258b0f801beaa1b2ee343e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/plugins/accessible/quick/quick.pro
src/quick/items/qquickpincharea.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Manually adjusted for TestHTTPServer constructor change:
tests/auto/quick/qquickimage/tst_qquickimage.cpp
Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f
Diffstat (limited to 'src/quick/items/qquicktextinput_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 5a88273543..211aba8703 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -100,9 +100,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickTextInput : public QQuickImplicitSizeItem Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged) Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged) Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged) -#ifndef QT_NO_CLIPBOARD Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged) -#endif Q_PROPERTY(bool canUndo READ canUndo NOTIFY canUndoChanged) Q_PROPERTY(bool canRedo READ canRedo NOTIFY canRedoChanged) #ifndef QT_NO_IM @@ -261,9 +259,7 @@ public: QRectF boundingRect() const; QRectF clipRect() const; -#ifndef QT_NO_CLIPBOARD bool canPaste() const; -#endif bool canUndo() const; bool canRedo() const; |