diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index a0ac884fe..02de6298a 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -2463,6 +2463,7 @@ bool QQuickTextInput::canPaste() const
#if QT_CONFIG(clipboard)
Q_D(const QQuickTextInput);
if (!d->canPasteValid) {
+ qDebug() << "DAVE: Looking up!";
if (const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData())
const_cast<QQuickTextInputPrivate *>(d)->canPaste = !d->m_readOnly && mimeData->hasText();
const_cast<QQuickTextInputPrivate *>(d)->canPasteValid = true;
@@ -2825,9 +2826,24 @@ QRectF QQuickTextInput::clipRect() const
return r;
}
+bool QQuickTextInput::isCanPasteConnected()
+{
+ IS_SIGNAL_CONNECTED(this, QQuickTextInput, canPasteChanged, ());
+}
+
void QQuickTextInput::q_canPasteChanged()
{
Q_D(QQuickTextInput);
+
+ qDebug() << "is connected ? " << isCanPasteConnected() << isSignalConnected(QMetaMethod::fromSignal(&QQuickTextInput::canPasteChanged));
+
+ if (!isCanPasteConnected()) {
+ qDebug() << "DAVE: not checking yet, defer for property fetch";
+ d->canPasteValid = false;
+ return;
+ }
+ qDebug() << "DAVE: checking can paste";
+
bool old = d->canPaste;
#if QT_CONFIG(clipboard)
if (const QMimeData *mimeData = QGuiApplication::clipboard()->mimeData())
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h
index c46a2f812..a60e0e570 100644
--- a/src/quick/items/qquicktextinput_p.h
+++ b/src/quick/items/qquicktextinput_p.h
@@ -416,6 +416,7 @@ private Q_SLOTS:
private:
friend class QQuickTextUtil;
+ bool isCanPasteConnected();
Q_DECLARE_PRIVATE(QQuickTextInput)
};
diff --git a/tests/auto/qml/ecmascripttests/test262 b/tests/auto/qml/ecmascripttests/test262
index 40b4f28e9..e505c11ee 160000
--- a/tests/auto/qml/ecmascripttests/test262
+++ b/tests/auto/qml/ecmascripttests/test262
@@ -1 +1 @@
-Subproject commit 40b4f28e98c416a092e26aa17489bf94ccb8bf4f
+Subproject commit e505c11eebe5a389a7d47a4bf570c66469740b01