aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual/quickcontrols2/viewinqwidget
diff options
context:
space:
mode:
authorMitch Curtis <[email protected]>2021-08-12 14:39:51 +0200
committerMitch Curtis <[email protected]>2021-08-16 12:52:59 +0200
commit809339d1484cf556512534367b8170bc26baf072 (patch)
tree12871313b658f36d058b5ef25af1e247e9c46ce9 /tests/manual/quickcontrols2/viewinqwidget
parentb01b4f00eae8022c6a97d90f54dac395144ae095 (diff)
Remove qtquickcontrols2 sources and explain where they wentHEADdev
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/viewinqwidget')
-rw-r--r--tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt41
-rw-r--r--tests/manual/quickcontrols2/viewinqwidget/main.cpp91
-rw-r--r--tests/manual/quickcontrols2/viewinqwidget/main.qml49
-rw-r--r--tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro6
-rw-r--r--tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc5
5 files changed, 0 insertions, 192 deletions
diff --git a/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt b/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
deleted file mode 100644
index f91b0d8c..00000000
--- a/tests/manual/quickcontrols2/viewinqwidget/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# Generated from viewinqwidget.pro.
-
-if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
- cmake_minimum_required(VERSION 3.16)
- project(viewinqwidget LANGUAGES C CXX ASM)
- find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
-endif()
-
-#####################################################################
-## viewinqwidget Binary:
-#####################################################################
-
-qt_internal_add_manual_test(viewinqwidget
- GUI
- SOURCES
- main.cpp
- DEFINES
- SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
- PUBLIC_LIBRARIES
- Qt::Gui
- Qt::Qml
- Qt::Quick
- Qt::QuickWidgets
- Qt::Widgets
-)
-
-# Resources:
-set(viewinqwidget_resource_files
- "main.qml"
-)
-
-qt_internal_add_resource(viewinqwidget "viewinqwidget"
- PREFIX
- "/"
- FILES
- ${viewinqwidget_resource_files}
-)
-
-
-#### Keys ignored in scope 1:.:.:viewinqwidget.pro:<TRUE>:
-# OTHER_FILES = "main.qml"
diff --git a/tests/manual/quickcontrols2/viewinqwidget/main.cpp b/tests/manual/quickcontrols2/viewinqwidget/main.cpp
deleted file mode 100644
index b6b7a5ff..00000000
--- a/tests/manual/quickcontrols2/viewinqwidget/main.cpp
+++ /dev/null
@@ -1,91 +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 <QApplication>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QDebug>
-#include <QDir>
-#include <QGroupBox>
-#include <QScreen>
-#include <QQmlApplicationEngine>
-#include <QQmlError>
-#include <QQuickView>
-#include <QQuickWidget>
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv);
-
- QWidget widget;
- widget.setWindowTitle(QT_VERSION_STR);
-
- QHBoxLayout *hLayout = new QHBoxLayout(&widget);
- QGroupBox *groupBox = new QGroupBox("QuickWidget", &widget);
- QVBoxLayout *vLayout = new QVBoxLayout(groupBox);
- QQuickWidget *quickWidget = new QQuickWidget(groupBox);
- quickWidget->setMinimumSize(360, 520);
- vLayout->addWidget(quickWidget);
- quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
- quickWidget->setSource(QUrl(QLatin1String("qrc:/main.qml")));
- if (quickWidget->status() == QQuickWidget::Error) {
- qWarning() << quickWidget->errors();
- return 1;
- }
- hLayout->addWidget(groupBox);
-
- const QString gallerySource =
- QDir::cleanPath(QLatin1String(SRCDIR"../../../examples/quickcontrols2/gallery/gallery.qml"));
- QQmlApplicationEngine engine(QUrl::fromLocalFile(gallerySource));
- QObject *root = engine.rootObjects().value(0, nullptr);
- if (!root || !root->isWindowType()) {
- qWarning() << "Load error" << gallerySource;
- return 1;
- }
- groupBox = new QGroupBox("QQuickView/createWindowContainer", &widget);
- vLayout = new QVBoxLayout(groupBox);
- QWidget *container = QWidget::createWindowContainer(qobject_cast<QWindow *>(root), groupBox);
- container->setMinimumSize(360, 520);
- vLayout->addWidget(container);
- hLayout->addWidget(groupBox);
-
- const QRect availableGeometry = widget.screen()->availableGeometry();
- widget.move(availableGeometry.center() - QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height() / 2));
-
- widget.show();
-
- return app.exec();
-}
diff --git a/tests/manual/quickcontrols2/viewinqwidget/main.qml b/tests/manual/quickcontrols2/viewinqwidget/main.qml
deleted file mode 100644
index 5ac170b3..00000000
--- a/tests/manual/quickcontrols2/viewinqwidget/main.qml
+++ /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$
-**
-****************************************************************************/
-
-import QtQuick
-import QtQuick.Controls
-
-Item {
- visible: true
- width: 360
- height: 520
-
- ComboBox {
- model: ["First", "Second", "Third"]
- anchors.centerIn: parent
- }
-}
diff --git a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
deleted file mode 100644
index 649829d4..00000000
--- a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-QT += qml quick widgets quickwidgets
-TARGET = viewinqwidget
-SOURCES += $$PWD/main.cpp
-OTHER_FILES += main.qml
-RESOURCES += viewinqwidget.qrc
-DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc b/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc
deleted file mode 100644
index 5f6483ac..00000000
--- a/tests/manual/quickcontrols2/viewinqwidget/viewinqwidget.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>main.qml</file>
- </qresource>
-</RCC>