diff options
author | Alexandru Croitor <[email protected]> | 2021-08-12 11:24:12 +0200 |
---|---|---|
committer | Alexandru Croitor <[email protected]> | 2021-08-12 17:51:01 +0200 |
commit | 425911d07fc8c3bb899226a1355c38a166b5e1de (patch) | |
tree | 1d5e0e5ae3ec66b10920bb9104e7d12c69b4a52f /tests/manual/smooth | |
parent | 59ab3e11433a5157aac0f3af7c0d7fe70a373373 (diff) |
Add a README.md mentioning the documentation on where the ported
effects can be found, as well as how to check out the Qt5 branch.
Pick-to: 6.2
Fixes: QTBUG-95757
Change-Id: Ib47c7e73f8622c8e287df0f74c6f16a5113b357e
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>
Diffstat (limited to 'tests/manual/smooth')
-rw-r--r-- | tests/manual/smooth/CMakeLists.txt | 48 | ||||
-rw-r--r-- | tests/manual/smooth/CellContainer.qml | 9 | ||||
-rw-r--r-- | tests/manual/smooth/SourceImage.qml | 8 | ||||
-rw-r--r-- | tests/manual/smooth/main.cpp | 67 | ||||
-rw-r--r-- | tests/manual/smooth/main.qml | 358 | ||||
-rw-r--r-- | tests/manual/smooth/resources.qrc | 8 | ||||
-rw-r--r-- | tests/manual/smooth/smooth.pro | 30 | ||||
-rw-r--r-- | tests/manual/smooth/star.png | bin | 641 -> 0 bytes |
8 files changed, 0 insertions, 528 deletions
diff --git a/tests/manual/smooth/CMakeLists.txt b/tests/manual/smooth/CMakeLists.txt deleted file mode 100644 index 9912fcf..0000000 --- a/tests/manual/smooth/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# Generated from smooth.pro. - -##################################################################### -## smooth Binary: -##################################################################### - -qt_internal_add_manual_test(smooth - GUI - SOURCES - main.cpp - DEFINES - QT_DEPRECATED_WARNINGS - PUBLIC_LIBRARIES - Qt::Gui - Qt::Quick -) - -# Resources: -set(resources_resource_files - "CellContainer.qml" - "SourceImage.qml" - "main.qml" - "star.png" -) - -qt_internal_add_resource(smooth "resources" - PREFIX - "/" - FILES - ${resources_resource_files} -) - - -#### Keys ignored in scope 1:.:.:smooth.pro:<TRUE>: -# QML_DESIGNER_IMPORT_PATH = <EMPTY> -# QML_IMPORT_PATH = <EMPTY> - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:smooth.pro:QNX: -# target.path = "/tmp/$${TARGET}/bin" - -#### Keys ignored in scope 4:.:.:smooth.pro:UNIX AND NOT ANDROID: -# target.path = "/opt/$${TARGET}/bin" - -#### Keys ignored in scope 5:.:.:smooth.pro:NOT target.path_ISEMPTY: -# INSTALLS = "target" diff --git a/tests/manual/smooth/CellContainer.qml b/tests/manual/smooth/CellContainer.qml deleted file mode 100644 index 60af0f7..0000000 --- a/tests/manual/smooth/CellContainer.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 - -Item { - implicitWidth: children[0].implicitWidth * children[0].scale - implicitHeight: children[0].implicitHeight * children[0].scale - - Layout.alignment: Qt.AlignHCenter -} diff --git a/tests/manual/smooth/SourceImage.qml b/tests/manual/smooth/SourceImage.qml deleted file mode 100644 index 86cf269..0000000 --- a/tests/manual/smooth/SourceImage.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.12 - -Image { - source: "star.png" - smooth: false - scale: 4 - transformOrigin: Item.TopLeft -} diff --git a/tests/manual/smooth/main.cpp b/tests/manual/smooth/main.cpp deleted file mode 100644 index 26af78c..0000000 --- a/tests/manual/smooth/main.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Graphical Effects module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QGuiApplication> -#include <QQmlApplicationEngine> -#include <QQuickItem> - -int main(int argc, char *argv[]) -{ - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - if (engine.rootObjects().isEmpty()) - return -1; - - return app.exec(); -} diff --git a/tests/manual/smooth/main.qml b/tests/manual/smooth/main.qml deleted file mode 100644 index 3c458cc..0000000 --- a/tests/manual/smooth/main.qml +++ /dev/null @@ -1,358 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.12 -import QtQuick.Window 2.12 -import QtQuick.Layouts 1.12 -import QtGraphicalEffects 1.12 - -/* - A testbench for source items (and effects) that set smooth to false. - - Setting smooth to false doesn't make sense for all effects (like blurs). -*/ - -Window { - id: window - width: 1200 - height: 1000 - visible: true - - Flickable { - anchors.fill: parent - contentWidth: rowLayout.width - contentHeight: rowLayout.implicitHeight - - GridLayout { - id: rowLayout - width: window.width - columns: 4 - - // Header - Text { - text: "Plain Image" - Layout.alignment: Qt.AlignHCenter - Layout.column: 1 - } - - Text { - text: "... with standalone effect" - Layout.alignment: Qt.AlignHCenter - } - - Text { - text: "... with layer effect" - Layout.alignment: Qt.AlignHCenter - } - - // ColorOverlay - Text { - text: "ColorOverlay" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - ColorOverlay { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - color: "#aa0ff000" - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: ColorOverlay { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - color: "#aa0ff000" - } - } - } - - // Colorize - Text { - text: "Colorize" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - Colorize { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - hue: 0.5 - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: Colorize { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - hue: 0.5 - } - } - } - - // BrightnessContrast - Text { - text: "BrightnessContrast" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - BrightnessContrast { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - brightness: 0.5 - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: BrightnessContrast { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - brightness: 0.5 - } - } - } - - // HueSaturation - Text { - text: "HueSaturation" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - HueSaturation { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - saturation: 1.0 - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: HueSaturation { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - saturation: 1.0 - } - } - } - - // Desaturate - Text { - text: "Desaturate" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - Desaturate { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - desaturation: 0.85 - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: Desaturate { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - desaturation: 0.85 - } - } - } - - // GammaAdjust - Text { - text: "GammaAdjust" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - // doesn't seem to do anything... - GammaAdjust { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - gamma: 10 - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: GammaAdjust { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - gamma: 10 - } - } - } - - // LevelAdjust - Text { - text: "LevelAdjust" - Layout.fillWidth: true - } - - CellContainer { - SourceImage {} - } - - CellContainer { - SourceImage { - visible: false - } - - LevelAdjust { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - minimumOutput: "#00ffffff" - maximumOutput: "#ff000000" - scale: parent.children[0].scale - transformOrigin: Item.TopLeft - } - } - - CellContainer { - SourceImage { - layer.enabled: true - layer.effect: LevelAdjust { - width: parent.children[0].width - height: parent.children[0].height - source: parent.children[0] - minimumOutput: "#00ffffff" - maximumOutput: "#ff000000" - } - } - } - } - } -} diff --git a/tests/manual/smooth/resources.qrc b/tests/manual/smooth/resources.qrc deleted file mode 100644 index b2b4653..0000000 --- a/tests/manual/smooth/resources.qrc +++ /dev/null @@ -1,8 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>main.qml</file> - <file>CellContainer.qml</file> - <file>SourceImage.qml</file> - <file>star.png</file> - </qresource> -</RCC> diff --git a/tests/manual/smooth/smooth.pro b/tests/manual/smooth/smooth.pro deleted file mode 100644 index 5e577f4..0000000 --- a/tests/manual/smooth/smooth.pro +++ /dev/null @@ -1,30 +0,0 @@ -QT += quick -CONFIG += c++11 - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - main.cpp - -RESOURCES += \ - resources.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Additional import path used to resolve QML modules just for Qt Quick Designer -QML_DESIGNER_IMPORT_PATH = - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target diff --git a/tests/manual/smooth/star.png b/tests/manual/smooth/star.png Binary files differdeleted file mode 100644 index 81c9ade..0000000 --- a/tests/manual/smooth/star.png +++ /dev/null |