From 9c4ff31161c2ea09c790ab143a23b3fe997ed4a3 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 19 Dec 2018 10:40:31 +0100 Subject: Remove the QML dummyimports Because of the recent refactoring the dummyimports are now even more outdated than before, so we better remove them now. Once we find a good way to generate/maintain them, they could come back. Change-Id: Id8758145fe2d47cfd19732f42d767e6dfad53ef9 Reviewed-by: Robert Griebl --- application-manager.pro | 2 +- .../ApplicationIPCInterface.qml | 47 -------- .../QtApplicationManager/ApplicationInstaller.js | 46 -------- .../QtApplicationManager/ApplicationManager.qml | 128 --------------------- .../ApplicationManagerWindow.qml | 61 ---------- dummyimports/QtApplicationManager/Notification.qml | 50 -------- .../QtApplicationManager/SystemMonitor.qml | 53 --------- .../QtApplicationManager/WindowManager.qml | 85 -------------- dummyimports/QtApplicationManager/qmldir | 7 -- dummyimports/dummyimports.pro | 6 - 10 files changed, 1 insertion(+), 484 deletions(-) delete mode 100644 dummyimports/QtApplicationManager/ApplicationIPCInterface.qml delete mode 100644 dummyimports/QtApplicationManager/ApplicationInstaller.js delete mode 100644 dummyimports/QtApplicationManager/ApplicationManager.qml delete mode 100644 dummyimports/QtApplicationManager/ApplicationManagerWindow.qml delete mode 100644 dummyimports/QtApplicationManager/Notification.qml delete mode 100644 dummyimports/QtApplicationManager/SystemMonitor.qml delete mode 100644 dummyimports/QtApplicationManager/WindowManager.qml delete mode 100644 dummyimports/QtApplicationManager/qmldir delete mode 100644 dummyimports/dummyimports.pro diff --git a/application-manager.pro b/application-manager.pro index 9ed661b3..eceac41b 100644 --- a/application-manager.pro +++ b/application-manager.pro @@ -52,7 +52,7 @@ linux:!android:!disable-libbacktrace:if(enable-libbacktrace|CONFIG(debug, debug| check_libbacktrace = "no" } -!tools-only: SUBDIRS += doc dummyimports +!tools-only: SUBDIRS += doc load(qt_parts) diff --git a/dummyimports/QtApplicationManager/ApplicationIPCInterface.qml b/dummyimports/QtApplicationManager/ApplicationIPCInterface.qml deleted file mode 100644 index 15f548a7..00000000 --- a/dummyimports/QtApplicationManager/ApplicationIPCInterface.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -import QtQml 2.0 - -QtObject { -} diff --git a/dummyimports/QtApplicationManager/ApplicationInstaller.js b/dummyimports/QtApplicationManager/ApplicationInstaller.js deleted file mode 100644 index 563ef044..00000000 --- a/dummyimports/QtApplicationManager/ApplicationInstaller.js +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -function removePackage(id) { - print("Dummy implementation of removePackage was called for ", id) - return "" -} diff --git a/dummyimports/QtApplicationManager/ApplicationManager.qml b/dummyimports/QtApplicationManager/ApplicationManager.qml deleted file mode 100644 index d99375cd..00000000 --- a/dummyimports/QtApplicationManager/ApplicationManager.qml +++ /dev/null @@ -1,128 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -pragma Singleton -import QtQuick 2.2 - -ListModel { - id: root - - property int count: 3 - property bool dummy: true - - property var applibrary : [ - ["com.pelagicore.browser","icon.png", "Browser", "browser", "Browser.qml"], - ["com.pelagicore.movies","icon.png", "Movies", "media", "Movies.qml"], - ["com.pelagicore.music","icon.png", "Music", "media", "Music.qml"], - ] - - signal emitSurface(int index, Item item) - - - - function setApplicationAudioFocus(appId, appFocus) - { - print("setApplicationAudioFocus(" + appId + ", " + appFocus + ")") - } - - function qmltypeof(obj, className) { // QtObject, string -> bool - // className plus "(" is the class instance without modification - // className plus "_QML" is the class instance with user-defined properties - var str = obj.toString(); - return str.indexOf(className + "(") == 0 || str.indexOf(className + "_QML") == 0; - } - - function startApplication(id) { - print("Starting the application. ") - var component - var item - for (var i = 0; i < root.count; i++) { - var entry - print("ApplicationManager: " + createAppEntry(i).applicationId + " given app id to open: " + id) - if (root.get(i).applicationId === id) { - component = Qt.createComponent("../../../../apps/" + createAppEntry(i).applicationId + "/" + createAppEntry(i).qml); - if (component.status === Component.Ready) { - item = component.createObject() - if (!item) - console.log("Failed to create an Object.") - else { - print("Starting the application. Sending a signal", i, item, item.children.length) - root.setProperty(i, "surfaceItem", item) - root.emitSurface(i, item) - } - } - else - console.log("Component creation failed " + createAppEntry(i).qml + " Error: " + component.errorString()) - } - } - } - - - - function createAppEntry(i) { - - var entry = { - applicationId: applibrary[i][0], - icon: "../../apps/" + applibrary[i][0] + "/" + applibrary[i][1], - name: applibrary[i][2], - isRunning: false, - isStarting: false, - isActive: false, - isBlocked: false, - isUpdating: false, - isRemovable: false, - updateProgress: 0, - codeFilePath: "", - categories: applibrary[i][3], - qml: applibrary[i][4], - surfaceItem: null - } - return entry - } - Component.onCompleted: { - clear() - for (var i = 0; i < root.count; i++) { - append(createAppEntry(i)) - } - } - -} diff --git a/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml b/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml deleted file mode 100644 index 81d344b3..00000000 --- a/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -import QtQuick 2.0 -import QtApplicationManager.SystemUI 2.0 - -Item { - id: root - width: 768 - height: 860 - property color color - - signal windowPropertyChanged(string name, var value) - signal close() - //function showFullScreen() {} - function showMaximized() {} - function showNormal() {} - function setWindowProperty(status, value) { - WindowManager.surfaceWindowPropertyChanged(root, status, value) - windowPropertyChanged(status, value) - } -} diff --git a/dummyimports/QtApplicationManager/Notification.qml b/dummyimports/QtApplicationManager/Notification.qml deleted file mode 100644 index 74cd48d7..00000000 --- a/dummyimports/QtApplicationManager/Notification.qml +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -import QtQml 2.0 - -QtObject { - property string summary - property int timeout - property variant actions -} diff --git a/dummyimports/QtApplicationManager/SystemMonitor.qml b/dummyimports/QtApplicationManager/SystemMonitor.qml deleted file mode 100644 index 722fda9d..00000000 --- a/dummyimports/QtApplicationManager/SystemMonitor.qml +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -pragma Singleton - -import QtQml 2.0 - -QtObject { - property int reportingInterval - property bool cpuLoadReportingEnabled - property bool fpsReportingEnabled - signal fpsReportingChanged(real average, real minimum, real maximum, real jitter) -} diff --git a/dummyimports/QtApplicationManager/WindowManager.qml b/dummyimports/QtApplicationManager/WindowManager.qml deleted file mode 100644 index 0146781a..00000000 --- a/dummyimports/QtApplicationManager/WindowManager.qml +++ /dev/null @@ -1,85 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Luxoft Sweden AB -** Copyright (C) 2018 Pelagicore AG -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Luxoft Application Manager. -** -** $QT_BEGIN_LICENSE:LGPL-QTAS$ -** Commercial License Usage -** Licensees holding valid commercial Qt Automotive Suite 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. -** -** 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.LGPL3 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-3.0.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 (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -** SPDX-License-Identifier: LGPL-3.0 -** -****************************************************************************/ - -pragma Singleton -import QtQuick 2.2 -import QtApplicationManager.SystemUI 2.0 - -QtObject { - id: root - property int count: ApplicationManager.count - property var surfaceItems: [] - property Connections conn: Connections { - target: ApplicationManager - onEmitSurface: { - surfaceItems[index] = item - root.surfaceItemReady(index, item) - } - } - - signal surfaceItemReady(int index, Item item) - signal surfaceItemClosing() - signal surfaceItemLost() - signal raiseApplicationWindow() - signal surfaceWindowPropertyChanged(Item surfaceItem, string name, var value) - - function setSurfaceWindowProperty(appItem, type, status) { - appItem.windowPropertyChanged(type, status) - } - - function surfaceWindowProperty(item, type) { - return false - } - - function get(index) { - var entry = ApplicationManager.get(index) - entry.surfaceItem = surfaceItems[index] - return entry - } - - Component.onCompleted: { - for (var i = 0; i < root.count; i++) { - surfaceItems.push(null) - } - } - -} diff --git a/dummyimports/QtApplicationManager/qmldir b/dummyimports/QtApplicationManager/qmldir deleted file mode 100644 index 7753156d..00000000 --- a/dummyimports/QtApplicationManager/qmldir +++ /dev/null @@ -1,7 +0,0 @@ -singleton ApplicationManager 2.0 ApplicationManager.qml -ApplicationManagerWindow 2.0 ApplicationManagerWindow.qml -ApplicationInstaller 2.0 ApplicationInstaller.js -ApplicationIPCInterface 2.0 ApplicationIPCInterface.qml -Notification 2.0 Notification.qml -singleton WindowManager 2.0 WindowManager.qml -singleton SystemMonitor 2.0 SystemMonitor.qml diff --git a/dummyimports/dummyimports.pro b/dummyimports/dummyimports.pro deleted file mode 100644 index 338e3e60..00000000 --- a/dummyimports/dummyimports.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = aux - -OTHER_FILES += \ - QtApplicationManager/*.js \ - QtApplicationManager/*.qml \ - QtApplicationManager/qmldir \ -- cgit v1.2.3