From 31f9c57bc50ae053cfaf039a1dfdb128e2494458 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 20 Oct 2015 13:18:59 +0300 Subject: Fix issues with COIN builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f Reviewed-by: Tomi Korpipää --- tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml | 51 ---- .../qml/qmlmultiwindow/NewButton.qml | 55 ----- tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml | 263 --------------------- 3 files changed, 369 deletions(-) delete mode 100644 tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml delete mode 100644 tests/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml delete mode 100644 tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml (limited to 'tests/qmlmultiwindow/qml/qmlmultiwindow') diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml b/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml deleted file mode 100644 index 3571e7dc..00000000 --- a/tests/qmlmultiwindow/qml/qmlmultiwindow/Data.qml +++ /dev/null @@ -1,51 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** 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. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -import QtQuick 2.1 - -Item { - property alias myData: dataModel - - ListModel { - id: dataModel - ListElement{ row: "0"; col: "0"; longitude: "20.0"; latitude: "10.0"; pop_density: "4.75"; } - ListElement{ row: "1"; col: "0"; longitude: "21.1"; latitude: "10.3"; pop_density: "3.00"; } - ListElement{ row: "2"; col: "0"; longitude: "22.5"; latitude: "10.7"; pop_density: "1.24"; } - ListElement{ row: "3"; col: "0"; longitude: "24.0"; latitude: "10.5"; pop_density: "2.53"; } - ListElement{ row: "0"; col: "1"; longitude: "20.2"; latitude: "11.2"; pop_density: "3.55"; } - ListElement{ row: "1"; col: "1"; longitude: "21.3"; latitude: "11.5"; pop_density: "3.03"; } - ListElement{ row: "2"; col: "1"; longitude: "22.6"; latitude: "11.7"; pop_density: "3.46"; } - ListElement{ row: "3"; col: "1"; longitude: "23.4"; latitude: "11.5"; pop_density: "4.12"; } - ListElement{ row: "0"; col: "2"; longitude: "20.2"; latitude: "12.3"; pop_density: "3.37"; } - ListElement{ row: "1"; col: "2"; longitude: "21.1"; latitude: "12.4"; pop_density: "2.98"; } - ListElement{ row: "2"; col: "2"; longitude: "22.5"; latitude: "12.1"; pop_density: "3.33"; } - ListElement{ row: "3"; col: "2"; longitude: "23.3"; latitude: "12.7"; pop_density: "3.23"; } - ListElement{ row: "0"; col: "3"; longitude: "20.7"; latitude: "13.3"; pop_density: "5.34"; } - ListElement{ row: "1"; col: "3"; longitude: "21.5"; latitude: "13.2"; pop_density: "4.54"; } - ListElement{ row: "2"; col: "3"; longitude: "22.4"; latitude: "13.6"; pop_density: "4.65"; } - ListElement{ row: "3"; col: "3"; longitude: "23.2"; latitude: "13.4"; pop_density: "6.67"; } - ListElement{ row: "0"; col: "4"; longitude: "20.6"; latitude: "15.0"; pop_density: "6.01"; } - ListElement{ row: "1"; col: "4"; longitude: "21.3"; latitude: "14.6"; pop_density: "5.83"; } - ListElement{ row: "2"; col: "4"; longitude: "22.5"; latitude: "14.8"; pop_density: "7.32"; } - ListElement{ row: "3"; col: "4"; longitude: "23.7"; latitude: "14.3"; pop_density: "6.90"; } - } -} - diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml b/tests/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml deleted file mode 100644 index 0f9a7a5b..00000000 --- a/tests/qmlmultiwindow/qml/qmlmultiwindow/NewButton.qml +++ /dev/null @@ -1,55 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** 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. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -import QtQuick 2.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 - -Item { - id: newbutton - - property alias text: buttonText.text - - signal clicked - - implicitWidth: buttonText.implicitWidth + 5 - implicitHeight: buttonText.implicitHeight + 10 - - Button { - id: buttonText - width: parent.width - height: parent.height - - style: ButtonStyle { - label: Component { - Text { - text: buttonText.text - clip: true - wrapMode: Text.WordWrap - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - anchors.fill: parent - } - } - } - onClicked: newbutton.clicked() - } -} diff --git a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml b/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml deleted file mode 100644 index 7200ba53..00000000 --- a/tests/qmlmultiwindow/qml/qmlmultiwindow/main.qml +++ /dev/null @@ -1,263 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** 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. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -import QtQuick 2.1 -import QtQuick.Window 2.1 -import QtQuick.Layouts 1.0 -import QtDataVisualization 1.0 -import "." - -Rectangle { - id: mainView - width: 800 - height: 600 - - Data { - id: data - } - - property QtObject surfaceWindowObject; - property string surfaceWindowStr: - "\n - import QtQuick 2.1\n - import QtQuick.Window 2.1\n - import QtQuick.Layouts 1.0\n - import QtDataVisualization 1.0\n - import \".\"\n - Window {\n - Data {\n - id: data\n - }\n - id: firstWindow\n - x: 100\n - y: 100\n - width: 500\n - height: 500\n - visible: true\n - Rectangle {\n - id: firstRect\n - color: \"red\"\n - anchors.fill: parent\n - Surface3D {\n - id: surfaceGraph\n - anchors.fill: parent\n - anchors.margins: parent.border.width\n - theme: Theme3D {\n - type: Theme3D.ThemePrimaryColors\n - font.pointSize: 60\n - }\n - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh\n - Surface3DSeries {\n - itemLabelFormat: \"Pop density at (@xLabel N, @zLabel E): @yLabel\"\n - ItemModelSurfaceDataProxy {\n - itemModel: data.myData\n - rowRole: \"row\"\n - columnRole: \"col\"\n - xPosRole: \"latitude\"\n - zPosRole: \"longitude\"\n - yPosRole: \"pop_density\"\n - }\n - }\n - }\n - }\n - }" - - Window { - id: secondWindow - x: 100 - y: 700 - width: 500 - height: 500 - visible: true - Rectangle { - id: secondRect - color: "blue" - anchors.fill: parent - } - } - - function destroyWindow() { - if (surfaceWindowObject != null) - surfaceWindowObject.destroy() - } - - Component.onDestruction: destroyWindow() - - //! [0] - GridLayout { - id: gridLayout - columns: 2 - Layout.fillHeight: true - Layout.fillWidth: true - anchors.top: mainView.top - anchors.bottom: mainView.bottom - anchors.left: mainView.left - anchors.right: mainView.right - - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - border.width: 2 - } - - Timer { - id: windowToggleTimer - interval: 1000 - running: false - repeat: false - onTriggered: { - destroyWindow() - surfaceWindowObject = Qt.createQmlObject(surfaceWindowStr, mainView) - } - } - - // We'll use one grid cell for buttons - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - - GridLayout { - anchors.right: parent.right - anchors.left: parent.left - anchors.top: parent.top - anchors.bottom: parent.bottom - columns: 2 - - NewButton { - Layout.minimumWidth: parent.width / 2 - Layout.fillHeight: true - Layout.fillWidth: true - text: "(re)construct surface window in a loop" - onClicked: { - windowToggleTimer.running = true - windowToggleTimer.repeat = true - } - } - - NewButton { - Layout.minimumWidth: parent.width / 2 - Layout.fillHeight: true - Layout.fillWidth: true - text: "Quit" - onClicked: Qt.quit(0); - } - - NewButton { - Layout.fillHeight: true - Layout.fillWidth: true - text: "Reset Cameras" - onClicked: resetCameras() // call a helper function to keep button itself simpler - } - - NewButton { - Layout.fillHeight: true - Layout.fillWidth: true - text: "Toggle Mesh Styles" - onClicked: toggleMeshStyle() // call a helper function to keep button itself simpler - } - } - } - - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - border.color: scatterGraph.theme.gridLineColor - border.width: 2 - - Scatter3D { - id: scatterGraph - anchors.fill: parent - anchors.margins: parent.border.width - theme: Theme3D { - type: Theme3D.ThemeDigia - font.pointSize: 60 - } - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh - - Scatter3DSeries { - itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" - ItemModelScatterDataProxy { - itemModel: data.myData - // Mapping model roles to scatter series item coordinates. - xPosRole: "latitude" - zPosRole: "longitude" - yPosRole: "pop_density" - } - } - } - } - - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - border.color: barGraph.theme.gridLineColor - border.width: 2 - - Bars3D { - id: barGraph - anchors.fill: parent - anchors.margins: parent.border.width - theme: Theme3D { - type: Theme3D.ThemeQt - font.pointSize: 60 - } - selectionMode: AbstractGraph3D.SelectionItemAndRow | AbstractGraph3D.SelectionSlice - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh - - Bar3DSeries { - itemLabelFormat: "@seriesName: @valueLabel" - name: "Population density" - - ItemModelBarDataProxy { - itemModel: data.myData - // Mapping model roles to bar series rows, columns, and values. - rowRole: "row" - columnRole: "col" - valueRole: "pop_density" - } - } - } - } - } - //! [0] - - function clearSelections() { - barGraph.clearSelection() - scatterGraph.clearSelection() - } - - function resetCameras() { - scatterGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - barGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - scatterGraph.scene.activeCamera.zoomLevel = 100.0 - barGraph.scene.activeCamera.zoomLevel = 100.0 - } - - function toggleMeshStyle() { - if (barGraph.seriesList[0].meshSmooth === true) { - barGraph.seriesList[0].meshSmooth = false - scatterGraph.seriesList[0].meshSmooth = false - } else { - barGraph.seriesList[0].meshSmooth = true - scatterGraph.seriesList[0].meshSmooth = true - } - } -} -- cgit v1.2.3