diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-16 13:49:27 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-05-16 16:08:12 +0200 |
| commit | 8d2ec6c1b223d69d828de3508f40681fdc349b5b (patch) | |
| tree | f616005185fffa942ce7ca6dc5108399896375eb | |
| parent | d6c16ee66aa9fa92b6a0373a0b5eea1587170145 (diff) | |
| download | qtdeclarative-8d2ec6c1b223d69d828de3508f40681fdc349b5b.tar.gz | |
Rename qmlimageprovideplugin test to qmlhighdpiimageproviderplugin
There are two `imageproviderplugin` in qtdeclarative repo, one in
example, and one manual test; and this can break the build in case
where both manual tests, and examples are set to be built. I renamed
the one in manual tests by specifying that it is a
HighDPI Image Provider.
Pick-to: 6.5
Change-Id: Ibebe80119f75e3ae71a4720408d81d501484b36b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | tests/manual/highdpi/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | tests/manual/highdpi/HighDPIImageProvider/qmldir | 1 | ||||
| -rw-r--r-- | tests/manual/highdpi/ImageProvider/qmldir | 1 | ||||
| -rw-r--r-- | tests/manual/highdpi/imageprovider.qml | 2 |
4 files changed, 6 insertions, 19 deletions
diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt index 7fd28828f1..f4b6dc70e8 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/CMakeLists.txt @@ -1,16 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from highdpi.pro. - -##################################################################### -## qmlimageproviderplugin Generic Library: -##################################################################### - -qt_internal_add_cmake_library(qmlimageproviderplugin +qt_internal_add_cmake_library(qmlhighdpiimageproviderplugin MODULE - INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/ImageProvider" - OUTPUT_DIRECTORY "ImageProvider" + INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/quick/imageprovider/HighDPIImageProvider" + OUTPUT_DIRECTORY "HighDPIImageProvider" SOURCES imageprovider.cpp LIBRARIES @@ -20,11 +14,4 @@ qt_internal_add_cmake_library(qmlimageproviderplugin Qt::Quick ) -#### Keys ignored in scope 1:.:.:highdpi.pro:<TRUE>: -# INSTALLS = "target" "qml" -# TEMPLATE = "lib" -# qml.files = "ImageProvider/qmldir" -# qml.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider" -# target.path = "$$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProvider" - -qt_autogen_tools_initial_setup(qmlimageproviderplugin) +qt_autogen_tools_initial_setup(qmlhighdpiimageproviderplugin) diff --git a/tests/manual/highdpi/HighDPIImageProvider/qmldir b/tests/manual/highdpi/HighDPIImageProvider/qmldir new file mode 100644 index 0000000000..a65519510e --- /dev/null +++ b/tests/manual/highdpi/HighDPIImageProvider/qmldir @@ -0,0 +1 @@ +plugin qmlhighdpiimageproviderplugin diff --git a/tests/manual/highdpi/ImageProvider/qmldir b/tests/manual/highdpi/ImageProvider/qmldir deleted file mode 100644 index add39d4ee8..0000000000 --- a/tests/manual/highdpi/ImageProvider/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin qmlimageproviderplugin diff --git a/tests/manual/highdpi/imageprovider.qml b/tests/manual/highdpi/imageprovider.qml index 348d12b2e1..3b8066cfa4 100644 --- a/tests/manual/highdpi/imageprovider.qml +++ b/tests/manual/highdpi/imageprovider.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import QtQuick 2.0 -import "ImageProvider" +import "HighDPIImageProvider" Rectangle { width: 400 |