diff options
author | Aleix Pol <aleixpol@kde.org> | 2015-05-23 14:10:36 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-05-23 13:52:36 +0000 |
commit | dad48f0e9cca10528fcaab7ec7d08f678e81b1a9 (patch) | |
tree | b2673ae09e2a5d1399e4bdbe266885fec3f35bcc /tests/auto/quick/qquickdroparea | |
parent | 1ebee6e995541554aa9250ccf3326d2579c237c6 (diff) |
Makes it possible to extract all data from a QML DropArea
There's many types that aren't being covered by DropArea API, such as
images. getDataAsString is not acceptable, since fromUtf8 chokes on
reading non-utf8.
This patch introduces getDataAsArrayBuffer method that won't try to convert
the data into a QString and simply pass a QV4::ArrayBuffer, that internally
keeps a QByteArray.
Change-Id: I65411b3d365ee6c5e13effd9167156771ee08a05
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickdroparea')
-rw-r--r-- | tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp index ece439d01a..67ee1a3714 100644 --- a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp +++ b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp @@ -78,6 +78,7 @@ private slots: // void drop_external(); void competingDrags(); void simultaneousDrags(); + void dropStuff(); private: QQmlEngine engine; @@ -1157,6 +1158,34 @@ void tst_QQuickDropArea::simultaneousDrags() QWindowSystemInterface::handleDrop(&alternateWindow, &data, QPoint(50, 50), Qt::CopyAction); } +void tst_QQuickDropArea::dropStuff() +{ + QQuickWindow window; + QQmlComponent component(&engine); + component.setData( + "import QtQuick 2.3\n" + "DropArea {\n" + "width: 100; height: 100\n" + "property var array\n" + "onDropped: { array = drop.getDataAsArrayBuffer('text/x-red'); }\n" + "}", QUrl()); + + QScopedPointer<QObject> object(component.create()); + QQuickItem *dropArea = qobject_cast<QQuickItem *>(object.data()); + QVERIFY(dropArea); + dropArea->setParentItem(window.contentItem()); + + QMimeData data; + data.setData("text/x-red", "red"); + + QCOMPARE(evaluate<QVariant>(dropArea, "array"), QVariant()); + + QWindowSystemInterface::handleDrag(&window, &data, QPoint(50, 50), Qt::CopyAction); + QWindowSystemInterface::handleDrop(&window, &data, QPoint(50, 50), Qt::CopyAction); + QCOMPARE(evaluate<int>(dropArea, "array.byteLength"), 3); + QCOMPARE(evaluate<QByteArray>(dropArea, "array"), QByteArray("red")); +} + QTEST_MAIN(tst_QQuickDropArea) #include "tst_qquickdroparea.moc" |