diff options
Diffstat (limited to 'tests/manual/wasm/clipboard')
-rw-r--r-- | tests/manual/wasm/clipboard/CMakeLists.txt | 18 | ||||
-rw-r--r-- | tests/manual/wasm/clipboard/clipboard.pro | 2 | ||||
-rw-r--r-- | tests/manual/wasm/clipboard/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/wasm/clipboard/mainwindow.cpp | 35 | ||||
-rw-r--r-- | tests/manual/wasm/clipboard/mainwindow.h | 2 |
5 files changed, 28 insertions, 31 deletions
diff --git a/tests/manual/wasm/clipboard/CMakeLists.txt b/tests/manual/wasm/clipboard/CMakeLists.txt index 4bc60a5edc..40fb8ca308 100644 --- a/tests/manual/wasm/clipboard/CMakeLists.txt +++ b/tests/manual/wasm/clipboard/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from clipboard.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## clipboard Binary: @@ -9,7 +10,9 @@ qt_internal_add_manual_test(clipboard SOURCES main.cpp mainwindow.cpp mainwindow.h mainwindow.ui - PUBLIC_LIBRARIES + NO_PCH_SOURCES + main.cpp # undef QT_NO_FOREACH + LIBRARIES Qt::Core Qt::Gui Qt::Widgets @@ -32,15 +35,6 @@ qt_internal_add_resource(clipboard "data" ##################################################################### qt_internal_extend_target(clipboard CONDITION (QT_MAJOR_VERSION GREATER 4) - PUBLIC_LIBRARIES + LIBRARIES Qt::Widgets ) - -#### Keys ignored in scope 3:.:.:clipboard.pro:QNX: -# target.path = "/tmp/$${TARGET}/bin" - -#### Keys ignored in scope 5:.:.:clipboard.pro:UNIX AND NOT ANDROID: -# target.path = "/opt/$${TARGET}/bin" - -#### Keys ignored in scope 6:.:.:clipboard.pro:NOT target.path_ISEMPTY: -# INSTALLS = "target" diff --git a/tests/manual/wasm/clipboard/clipboard.pro b/tests/manual/wasm/clipboard/clipboard.pro index 3286049225..cffce46997 100644 --- a/tests/manual/wasm/clipboard/clipboard.pro +++ b/tests/manual/wasm/clipboard/clipboard.pro @@ -6,7 +6,7 @@ CONFIG += c++11 # You can make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +#DEFINES += QT_DISABLE_DEPRECATED_UP_TO=0x060000 # disables all APIs deprecated in Qt 6.0.0 and earlier SOURCES += \ main.cpp \ diff --git a/tests/manual/wasm/clipboard/main.cpp b/tests/manual/wasm/clipboard/main.cpp index 7142125ff7..aa838f6670 100644 --- a/tests/manual/wasm/clipboard/main.cpp +++ b/tests/manual/wasm/clipboard/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "mainwindow.h" diff --git a/tests/manual/wasm/clipboard/mainwindow.cpp b/tests/manual/wasm/clipboard/mainwindow.cpp index 77d6582775..81a95c4218 100644 --- a/tests/manual/wasm/clipboard/mainwindow.cpp +++ b/tests/manual/wasm/clipboard/mainwindow.cpp @@ -1,5 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses #include "mainwindow.h" #include "ui_mainwindow.h" @@ -12,6 +14,7 @@ #include <QKeyEvent> #include <QMimeDatabase> #include <QFileInfo> +#include <QCryptographicHash> #ifdef Q_OS_WASM #include <emscripten.h> @@ -262,20 +265,19 @@ void MainWindow::dropEvent(QDropEvent* e) QString urlStr = url.toDisplayString(); int size = urlStr.length(); sizeStr.setNum(size); - ui->textEdit_2->insertPlainText(" Drop has url data length: " + sizeStr + "\n"); - ui->textEdit_2->insertPlainText(urlStr + "\n"); - - QString fname = url.toLocalFile(); - QFileInfo info(fname); - if (info.exists()) { // this is a file - QMimeDatabase db; - QMimeType mt = db.mimeTypeForFile(info); - if (mt.name().contains("image")) { - QImage image = QImage(fname); - setImage(image); - } + + QString fileName = url.toLocalFile(); + QString sha1; + QFile file(fileName); + if (file.exists()) { + file.open(QFile::ReadOnly); + sha1 = QCryptographicHash::hash(file.readAll(), QCryptographicHash::Sha1).toHex(); } + + ui->textEdit_2->insertPlainText(" Drop has url data length: " + sizeStr + "\n"); + ui->textEdit_2->insertPlainText(" " + urlStr + " sha1 " + sha1.left(8) + "\n"); } + ui->textEdit_2->insertPlainText("\n"); if (e->mimeData()->hasImage()) { qsizetype imageSize = qvariant_cast<QImage>(e->mimeData()->imageData()).sizeInBytes(); @@ -292,14 +294,15 @@ void MainWindow::dropEvent(QDropEvent* e) int size = e->mimeData()->html().length(); sizeStr.setNum(size); ui->textEdit_2->insertPlainText(" Drop has html data length: " + sizeStr + "\n"); - ui->textEdit_2->insertPlainText(e->mimeData()->html()+"\n"); - ui->textEdit->insertHtml(e->mimeData()->html()+"<br>"); + for (const auto &line : e->mimeData()->html().split('\n', Qt::SkipEmptyParts)) + ui->textEdit_2->insertPlainText(" " + line + "\n"); } if (e->mimeData()->hasText()) { int size = e->mimeData()->text().length(); sizeStr.setNum(size); ui->textEdit_2->insertPlainText(" Drop has text data length: " + sizeStr + "\n"); - ui->textEdit_2->insertPlainText(e->mimeData()->text()); + for (const auto &line : e->mimeData()->text().split('\n', Qt::SkipEmptyParts)) + ui->textEdit_2->insertPlainText(" " + line + "\n"); } const QString message = tr(" Drop accepted, %1 ") diff --git a/tests/manual/wasm/clipboard/mainwindow.h b/tests/manual/wasm/clipboard/mainwindow.h index d06b213971..fe101ad494 100644 --- a/tests/manual/wasm/clipboard/mainwindow.h +++ b/tests/manual/wasm/clipboard/mainwindow.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef MAINWINDOW_H #define MAINWINDOW_H |