diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 5195911c5f59d545eabfd2caa97a30591dd9ae80..597025b796439be08de24012183e26d32adaba23 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2337,7 +2337,6 @@ void QQuickTextInput::setPersistentSelection(bool on) emit persistentSelectionChanged(); } -#ifndef QT_NO_CLIPBOARD /*! \qmlproperty bool QtQuick::TextInput::canPaste @@ -2346,6 +2345,7 @@ void QQuickTextInput::setPersistentSelection(bool on) */ bool QQuickTextInput::canPaste() const { +#if !defined(QT_NO_CLIPBOARD) Q_D(const QQuickTextInput); if (!d->canPasteValid) { if (const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData()) @@ -2353,8 +2353,10 @@ bool QQuickTextInput::canPaste() const const_cast<QQuickTextInputPrivate *>(d)->canPasteValid = true; } return d->canPaste; -} +#else + return false; #endif +} /*! \qmlproperty bool QtQuick::TextInput::canUndo diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index 5f0250aaf13e6848a13ca96bbf100b2f2da76024..042859df1729552c4fc25401b7fab18de21706fb 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -99,9 +99,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 @@ -256,9 +254,7 @@ public: QRectF boundingRect() const; QRectF clipRect() const; -#ifndef QT_NO_CLIPBOARD bool canPaste() const; -#endif bool canUndo() const; bool canRedo() const;