Compile fix if QT_NO_CLIPBOARD defined

Change-Id: Ic287a89193c98b2405032fe5859782286d4528d0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 5aa01d2..c69fd50 100644 (file)
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -2210,6 +2210,7 @@ void QQuickTextInput::setPersistentSelection(bool on)
     emit persistentSelectionChanged();
 }
 
+#ifndef QT_NO_CLIPBOARD
 /*!
     \qmlproperty bool QtQuick2::TextInput::canPaste
 
@@ -2226,6 +2227,7 @@ bool QQuickTextInput::canPaste() const
     }
     return d->canPaste;
 }
+#endif
 
 /*!
     \qmlproperty bool QtQuick2::TextInput::canUndo

diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index 011af65..9d32eee 100644 (file)
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -98,7 +98,9 @@ class Q_AUTOTEST_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)
     Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged)
@@ -243,7 +245,9 @@ public:
     QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
 
     QRectF boundingRect() const;
+#ifndef QT_NO_CLIPBOARD
     bool canPaste() const;
+#endif
 
     bool canUndo() const;
     bool canRedo() const;