diff options
author | Mitch Curtis <[email protected]> | 2021-08-12 14:39:51 +0200 |
---|---|---|
committer | Mitch Curtis <[email protected]> | 2021-08-16 12:52:59 +0200 |
commit | 809339d1484cf556512534367b8170bc26baf072 (patch) | |
tree | 12871313b658f36d058b5ef25af1e247e9c46ce9 /tests/manual/quickcontrols2/fonts | |
parent | b01b4f00eae8022c6a97d90f54dac395144ae095 (diff) |
Now that qtquickcontrols2 has been merged into qtdeclarative,
we should make it obvious that this repo should no longer be
used, by preventing it from being built.
Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: I95bd6a214f3d75a865ab163ee0a1f9ffbeb7a051
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>
Diffstat (limited to 'tests/manual/quickcontrols2/fonts')
-rw-r--r-- | tests/manual/quickcontrols2/fonts/CMakeLists.txt | 50 | ||||
-rw-r--r-- | tests/manual/quickcontrols2/fonts/deployment.pri | 14 | ||||
-rw-r--r-- | tests/manual/quickcontrols2/fonts/fonts.pro | 14 | ||||
-rw-r--r-- | tests/manual/quickcontrols2/fonts/main.cpp | 49 | ||||
-rw-r--r-- | tests/manual/quickcontrols2/fonts/main.qml | 102 | ||||
-rw-r--r-- | tests/manual/quickcontrols2/fonts/qml.qrc | 6 |
6 files changed, 0 insertions, 235 deletions
diff --git a/tests/manual/quickcontrols2/fonts/CMakeLists.txt b/tests/manual/quickcontrols2/fonts/CMakeLists.txt deleted file mode 100644 index 6160ff11..00000000 --- a/tests/manual/quickcontrols2/fonts/CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -# Generated from fonts.pro. - -if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - cmake_minimum_required(VERSION 3.16) - project(fonts LANGUAGES C CXX ASM) - find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) -endif() - -##################################################################### -## fonts Binary: -##################################################################### - -qt_internal_add_manual_test(fonts - GUI - SOURCES - main.cpp - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick -) - -# Resources: -set(qml_resource_files - "main.qml" -) - -qt_internal_add_resource(fonts "qml" - PREFIX - "/" - FILES - ${qml_resource_files} -) - - -#### Keys ignored in scope 1:.:.:fonts.pro:<TRUE>: -# QML_IMPORT_PATH = <EMPTY> -# TEMPLATE = "app" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 3:.:.:deployment.pri:UNIX AND NOT ANDROID: -# INSTALLS = "target" - -#### Keys ignored in scope 5:.:.:deployment.pri:QNX: -# target.path = "/tmp/$${TARGET}/bin" - -#### Keys ignored in scope 6:.:.:deployment.pri:else: -# target.path = "/opt/$${TARGET}/bin" diff --git a/tests/manual/quickcontrols2/fonts/deployment.pri b/tests/manual/quickcontrols2/fonts/deployment.pri deleted file mode 100644 index c89af25a..00000000 --- a/tests/manual/quickcontrols2/fonts/deployment.pri +++ /dev/null @@ -1,14 +0,0 @@ -unix:!android { - isEmpty(target.path) { - qnx { - target.path = /tmp/$${TARGET}/bin - } else { - target.path = /opt/$${TARGET}/bin - } - export(target.path) - } - INSTALLS += target -} - -export(INSTALLS) - diff --git a/tests/manual/quickcontrols2/fonts/fonts.pro b/tests/manual/quickcontrols2/fonts/fonts.pro deleted file mode 100644 index 36e70f7e..00000000 --- a/tests/manual/quickcontrols2/fonts/fonts.pro +++ /dev/null @@ -1,14 +0,0 @@ -TEMPLATE = app - -QT += qml quick - -SOURCES += main.cpp - -RESOURCES += qml.qrc - -# Additional import path used to resolve QML modules in Qt Creator's code model -QML_IMPORT_PATH = - -# Default rules for deployment. -include(deployment.pri) - diff --git a/tests/manual/quickcontrols2/fonts/main.cpp b/tests/manual/quickcontrols2/fonts/main.cpp deleted file mode 100644 index 43e58bdd..00000000 --- a/tests/manual/quickcontrols2/fonts/main.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QGuiApplication> -#include <QQmlApplicationEngine> - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - - return app.exec(); -} - diff --git a/tests/manual/quickcontrols2/fonts/main.qml b/tests/manual/quickcontrols2/fonts/main.qml deleted file mode 100644 index 8d3464a0..00000000 --- a/tests/manual/quickcontrols2/fonts/main.qml +++ /dev/null @@ -1,102 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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 -import QtQuick.Controls -import QtQuick.Templates as T -import QtQuick.Layouts - -ApplicationWindow { - visible: true - width: 480 - height: 640 - title: qsTr("Hello World") - - header: ToolBar { - Slider { - from: 16 - to: 48 - stepSize: 1 - onValueChanged: control.font.pointSize = value - } - } - - Flickable { - anchors.fill: parent - contentWidth: control.width - contentHeight: control.height - - T.Control { - id: control - width: layout.implicitWidth + 40 - height: layout.implicitHeight + 40 - ColumnLayout { - id: layout - anchors.fill: parent - anchors.margins: 20 - Button { text: "Button" } - CheckBox { text: "CheckBox" } - GroupBox { title: "GroupBox" } - RadioButton { text: "RadioButton" } - Switch { text: "Switch" } - TabButton { - text: "TabButton" - font.pointSize: control.font.pointSize - } - TextField { placeholderText: "TextField" } - TextArea { placeholderText: "TextArea" } - ToolButton { text: "ToolButton" } - Tumbler { model: 3 } - } - } - - ScrollBar.vertical: ScrollBar { } - } -} diff --git a/tests/manual/quickcontrols2/fonts/qml.qrc b/tests/manual/quickcontrols2/fonts/qml.qrc deleted file mode 100644 index 0ff3892d..00000000 --- a/tests/manual/quickcontrols2/fonts/qml.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>main.qml</file> - </qresource> -</RCC> - |