summaryrefslogtreecommitdiffstats
path: root/tests/manual/quickwidget-switch
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-02-18 07:42:35 +0000
committerPaul Lemire <paul.lemire@kdab.com>2020-02-18 07:55:58 +0000
commitc6fecd32f8dfe4d72a7f059f83d69e61d5ded64d (patch)
tree54aa42ff1bdf2e1d3d330cc7e5bf43cd82c86188 /tests/manual/quickwidget-switch
parentecca6d21fbb4a07dcfe6144cc5a4f20981491bd1 (diff)
Revert "Allow for when a Scene3D item switches screens"
This reverts commit 648b7459e8a6ce8ce1f115a14da63d546b743439. Reason for revert: Introduces QTBUG-82275 Change-Id: I5514ad58707c086eaaab3203773614c939e461e8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests/manual/quickwidget-switch')
-rw-r--r--tests/manual/quickwidget-switch/main.cpp125
-rw-r--r--tests/manual/quickwidget-switch/main.qml152
-rw-r--r--tests/manual/quickwidget-switch/quickwidget-switch.pro13
-rw-r--r--tests/manual/quickwidget-switch/quickwidget-switch.qrc5
4 files changed, 0 insertions, 295 deletions
diff --git a/tests/manual/quickwidget-switch/main.cpp b/tests/manual/quickwidget-switch/main.cpp
deleted file mode 100644
index 5a2729969..000000000
--- a/tests/manual/quickwidget-switch/main.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D 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 <QDesktopWidget>
-#include <QScreen>
-#include <QApplication>
-#include <QMainWindow>
-#include <QMdiArea>
-#include <QMdiSubWindow>
-#include <QQuickWidget>
-#include <QVBoxLayout>
-#include <QPushButton>
-
-void configureMainWindow(QMainWindow *w, QMdiArea *mdiArea, QPushButton *button)
-{
- auto widget = new QWidget;
- auto layout = new QVBoxLayout;
- layout->addWidget(mdiArea);
- layout->addWidget(button);
- widget->setLayout(layout);
- w->setCentralWidget(widget);
-}
-
-int main(int argc, char* argv[])
-{
- QApplication app(argc, argv);
-
- QMainWindow w1;
- w1.winId();
- w1.windowHandle()->setScreen(QGuiApplication::screens().at(0));
- auto mdiArea1 = new QMdiArea;
- auto button1 = new QPushButton("Switch to other window");
- configureMainWindow(&w1, mdiArea1, button1);
- w1.setGeometry(0, 0, 800, 800);
- w1.show();
-
- QMainWindow w2;
- w2.winId();
- w2.windowHandle()->setScreen(QGuiApplication::screens().at(1));
- auto mdiArea2 = new QMdiArea;
- auto button2 = new QPushButton("Switch to other window");
- configureMainWindow(&w2, mdiArea2, button2);
- w2.setGeometry(0, 0, 800, 800);
- w2.show();
-
- QMdiSubWindow* subWindow = new QMdiSubWindow();
-
- QQuickWidget *quickWidget = new QQuickWidget();
- quickWidget->resize(QSize(400, 400));
- quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
- quickWidget->setSource(QUrl("qrc:/main.qml"));
-
- subWindow->setWidget(quickWidget);
-
- QObject::connect(button1, &QPushButton::clicked,
- [mdiArea1, mdiArea2, subWindow, button1, button2]() {
- mdiArea2->removeSubWindow(subWindow);
- mdiArea1->addSubWindow(subWindow);
- subWindow->show();
- button1->setEnabled(false);
- button2->setEnabled(true);
- });
-
- QObject::connect(button2, &QPushButton::clicked,
- [mdiArea1, mdiArea2, subWindow, button1, button2]() {
- mdiArea1->removeSubWindow(subWindow);
- mdiArea2->addSubWindow(subWindow);
- subWindow->show();
- button1->setEnabled(true);
- button2->setEnabled(false);
- });
-
- mdiArea2->addSubWindow(subWindow);
- button2->setEnabled(false);
- subWindow->show();
-
- return app.exec();
-}
diff --git a/tests/manual/quickwidget-switch/main.qml b/tests/manual/quickwidget-switch/main.qml
deleted file mode 100644
index c72bcab12..000000000
--- a/tests/manual/quickwidget-switch/main.qml
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D 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$
-**
-****************************************************************************/
-
-import QtQuick 2.2 as QQ2
-import Qt3D.Core 2.0
-import Qt3D.Render 2.0
-import Qt3D.Input 2.0
-import Qt3D.Extras 2.0
-
-import QtQuick.Scene3D 2.0
-
-QQ2.Item {
- id: mioitem
- width: 300
- height: 300
- Scene3D {
- id: scene3d
- anchors.fill: parent
- Entity {
- id: sceneRoot
-
- Camera {
- id: camera
- projectionType: CameraLens.PerspectiveProjection
- fieldOfView: 45
- aspectRatio: 16/9
- nearPlane : 0.1
- farPlane : 1000.0
- position: Qt.vector3d( 0.0, 0.0, -40.0 )
- upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
- viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 )
- }
-
- OrbitCameraController {
- camera: camera
- }
-
- components: [
- RenderSettings {
- activeFrameGraph: ForwardRenderer {
- clearColor: Qt.rgba(0, 0.5, 1, 1)
- camera: camera
- }
- },
- // Event Source will be set by the Qt3DQuickWindow
- InputSettings { }
- ]
-
- PhongMaterial {
- id: material
- }
-
- TorusMesh {
- id: torusMesh
- radius: 5
- minorRadius: 1
- rings: 100
- slices: 20
- }
-
- Transform {
- id: torusTransform
- scale3D: Qt.vector3d(1.5, 1, 0.5)
- rotation: fromAxisAndAngle(Qt.vector3d(1, 0, 0), 45)
- }
-
- Entity {
- id: torusEntity
- components: [ torusMesh, material, torusTransform ]
- }
-
- SphereMesh {
- id: sphereMesh
- radius: 3
- }
-
- Transform {
- id: sphereTransform
- property real userAngle: 0.0
- matrix: {
- var m = Qt.matrix4x4();
- m.rotate(userAngle, Qt.vector3d(0, 1, 0));
- m.translate(Qt.vector3d(20, 0, 0));
- return m;
- }
- }
-
- QQ2.NumberAnimation {
- target: sphereTransform
- property: "userAngle"
- duration: 10000
- from: 0
- to: 360
-
- loops: QQ2.Animation.Infinite
- running: true
- }
-
- Entity {
- id: sphereEntity
- components: [ sphereMesh, material, sphereTransform ]
- }
- }
- }
-}
diff --git a/tests/manual/quickwidget-switch/quickwidget-switch.pro b/tests/manual/quickwidget-switch/quickwidget-switch.pro
deleted file mode 100644
index 2f1cb98f5..000000000
--- a/tests/manual/quickwidget-switch/quickwidget-switch.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-
-QT += 3dextras
-CONFIG += resources_big
-
-QT += 3dcore 3drender 3dinput 3dquick 3dlogic qml quick 3dquickextras widgets quickwidgets
-
-SOURCES += \
- main.cpp
-
-RESOURCES += \
- quickwidget-switch.qrc
-
diff --git a/tests/manual/quickwidget-switch/quickwidget-switch.qrc b/tests/manual/quickwidget-switch/quickwidget-switch.qrc
deleted file mode 100644
index 5f6483ac3..000000000
--- a/tests/manual/quickwidget-switch/quickwidget-switch.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/">
- <file>main.qml</file>
- </qresource>
-</RCC>