From 44df7a357fc3d9f977ed36b4199d996869a396e9 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 23 Jan 2014 11:04:58 +0200 Subject: Move qmlmultigraphs to examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Fix Q3DScene::isPointInPrimarySubView +Fix Q3DScene::isPointInSecondarySubView +Remove some unnecessary imports from examples Task-number: QTRD-2800 Change-Id: I5a9bc737c5ee92edbb514e76054adbb54076aef8 Reviewed-by: Tomi Korpipää --- tests/qmlmultigraph/main.cpp | 48 ----- tests/qmlmultigraph/qml/qmlmultigraph/main.qml | 234 --------------------- .../qmlmultigraph/qml/qmlmultigraph/newbutton.qml | 52 ----- tests/qmlmultigraph/qmlmultigraph.pro | 25 --- tests/qmlmultigraph/qmlmultigraph.qrc | 6 - .../qtquick2applicationviewer.cpp | 81 ------- .../qtquick2applicationviewer.h | 33 --- .../qtquick2applicationviewer.pri | 180 ---------------- tests/tests.pro | 1 - 9 files changed, 660 deletions(-) delete mode 100644 tests/qmlmultigraph/main.cpp delete mode 100644 tests/qmlmultigraph/qml/qmlmultigraph/main.qml delete mode 100644 tests/qmlmultigraph/qml/qmlmultigraph/newbutton.qml delete mode 100644 tests/qmlmultigraph/qmlmultigraph.pro delete mode 100644 tests/qmlmultigraph/qmlmultigraph.qrc delete mode 100644 tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp delete mode 100644 tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h delete mode 100644 tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri (limited to 'tests') diff --git a/tests/qmlmultigraph/main.cpp b/tests/qmlmultigraph/main.cpp deleted file mode 100644 index 9d9e5d8a..00000000 --- a/tests/qmlmultigraph/main.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -#include -#include -#include "qtquick2applicationviewer.h" -#ifdef Q_OS_ANDROID -#include -#include -#endif -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - - QtQuick2ApplicationViewer viewer; - - // Enable antialiasing - viewer.setFormat(QtDataVisualization::qDefaultSurfaceFormat()); - -#ifdef Q_OS_ANDROID - viewer.addImportPath(QString::fromLatin1("assets:/qml")); - viewer.engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), - QString::fromLatin1("lib"))); -#endif - viewer.setTitle(QStringLiteral("QML multigraph test")); - viewer.setSource(QUrl("qrc:/qml/main.qml")); - viewer.setResizeMode(QQuickView::SizeRootObjectToView); - viewer.showMaximized(); - - return app.exec(); -} diff --git a/tests/qmlmultigraph/qml/qmlmultigraph/main.qml b/tests/qmlmultigraph/qml/qmlmultigraph/main.qml deleted file mode 100644 index 4f2f2052..00000000 --- a/tests/qmlmultigraph/qml/qmlmultigraph/main.qml +++ /dev/null @@ -1,234 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -import QtQuick 2.1 -import QtQuick.Layouts 1.0 -import QtDataVisualization 1.0 -import "." - -Item { - id: mainView - - Bars3D { - id: barGraph - width: parent.width / 3 - anchors.top: emptySpace.bottom - anchors.bottom: parent.bottom - theme: Theme3D { type: Theme3D.ThemeIsabelle } - //clearWindowBeforeRendering: false - - Bar3DSeries { - itemLabelFormat: "@colLabel, @rowLabel: @valueLabel" - - ItemModelBarDataProxy { - itemModel: barDataModel - // Mapping model roles to bar series rows, columns, and values. - rowRole: "year" - columnRole: "city" - valueRole: "expenses" - } - } - - Bar3DSeries { - itemLabelFormat: "@colLabel, @rowLabel: @valueLabel" - - ItemModelBarDataProxy { - itemModel: barDataModel - // Mapping model roles to bar series rows, columns, and values. - rowRole: "year" - columnRole: "city" - valueRole: "income" - } - } - - onRowAxisChanged: { - console.log("Bars: Row axis changed.") - } - onColumnAxisChanged: { - console.log("Bars: column axis changed.") - } - onValueAxisChanged: { - console.log("Bars: Value axis changed.") - } - } - - ListModel { - id: barDataModel - ListElement{ year: "2012"; city: "Oulu"; expenses: "4200"; income: "8300"; } - ListElement{ year: "2012"; city: "Rauma"; expenses: "2100"; income: "6500"; } - ListElement{ year: "2012"; city: "Helsinki"; expenses: "7040"; income: "7500"; } - ListElement{ year: "2012"; city: "Tampere"; expenses: "4330"; income: "5800"; } - ListElement{ year: "2013"; city: "Oulu"; expenses: "3960"; income: "9000"; } - ListElement{ year: "2013"; city: "Rauma"; expenses: "1990"; income: "3000"; } - ListElement{ year: "2013"; city: "Helsinki"; expenses: "7230"; income: "9900"; } - ListElement{ year: "2013"; city: "Tampere"; expenses: "4650"; income: "7600"; } - } - - Scatter3D { - id: scatterGraph - width: parent.width / 3 - anchors.left: barGraph.right - anchors.top: emptySpace.bottom - anchors.bottom: parent.bottom - theme: Theme3D { type: Theme3D.ThemeIsabelle } - //clearWindowBeforeRendering: false - - Scatter3DSeries { - ItemModelScatterDataProxy { - itemModel: scatterDataModel - // Mapping model roles to scatter series item coordinates. - xPosRole: "xPos" - yPosRole: "yPos" - zPosRole: "zPos" - } - } - - onAxisXChanged: { - console.log("Scatter: axis X changed.") - } - onAxisYChanged: { - console.log("Scatter: axis Y changed.") - } - onAxisZChanged: { - console.log("Scatter: axis Z changed.") - } - } - - ListModel { - id: scatterDataModel - ListElement{ xPos: "2.754"; yPos: "1.455"; zPos: "3.362"; } - ListElement{ xPos: "3.164"; yPos: "2.022"; zPos: "4.348"; } - ListElement{ xPos: "4.564"; yPos: "1.865"; zPos: "1.346"; } - ListElement{ xPos: "1.068"; yPos: "1.224"; zPos: "2.983"; } - ListElement{ xPos: "2.323"; yPos: "2.502"; zPos: "3.133"; } - } - - Surface3D { - id: surfaceGraph - width: parent.width / 3 - anchors.left: scatterGraph.right - anchors.top: emptySpace.bottom - anchors.bottom: parent.bottom - theme: Theme3D { type: Theme3D.ThemeIsabelle } - //clearWindowBeforeRendering: false - - Surface3DSeries { - itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" - ItemModelSurfaceDataProxy { - itemModel: surfaceDataModel - // Mapping model roles to surface series rows, columns, and values. - rowRole: "longitude" - columnRole: "latitude" - valueRole: "pop_density" - } - } - - onAxisXChanged: { - console.log("Surface: axis X changed.") - } - onAxisYChanged: { - console.log("Surface: axis Y changed.") - } - onAxisZChanged: { - console.log("Surface: axis Z changed.") - } - } - ListModel { - id: surfaceDataModel - ListElement{ longitude: "20"; latitude: "10"; pop_density: "4.75"; } - ListElement{ longitude: "21"; latitude: "10"; pop_density: "3.00"; } - ListElement{ longitude: "22"; latitude: "10"; pop_density: "1.24"; } - ListElement{ longitude: "23"; latitude: "10"; pop_density: "2.53"; } - ListElement{ longitude: "20"; latitude: "11"; pop_density: "2.55"; } - ListElement{ longitude: "21"; latitude: "11"; pop_density: "2.03"; } - ListElement{ longitude: "22"; latitude: "11"; pop_density: "3.46"; } - ListElement{ longitude: "23"; latitude: "11"; pop_density: "5.12"; } - ListElement{ longitude: "20"; latitude: "12"; pop_density: "1.37"; } - ListElement{ longitude: "21"; latitude: "12"; pop_density: "2.98"; } - ListElement{ longitude: "22"; latitude: "12"; pop_density: "3.33"; } - ListElement{ longitude: "23"; latitude: "12"; pop_density: "3.23"; } - ListElement{ longitude: "20"; latitude: "13"; pop_density: "4.34"; } - ListElement{ longitude: "21"; latitude: "13"; pop_density: "3.54"; } - ListElement{ longitude: "22"; latitude: "13"; pop_density: "1.65"; } - ListElement{ longitude: "23"; latitude: "13"; pop_density: "2.67"; } - } - - RowLayout { - id: buttonLayout - Layout.minimumHeight: exitButton.height - width: parent.width - anchors.left: parent.left - anchors.top: parent.top - spacing: 0 - - NewButton { - id: exitButton - Layout.fillHeight: true - Layout.fillWidth: true - text: "Quit" - onClicked: Qt.quit(0); - } - - NewButton { - id: resetAxesButton - Layout.fillHeight: true - Layout.fillWidth: true - text: "Reset axes" - onClicked: { - barGraph.rowAxis = null - barGraph.columnAxis = null - barGraph.valueAxis = null - scatterGraph.axisX = null - scatterGraph.axisY = null - scatterGraph.axisZ = null - surfaceGraph.axisX = null - surfaceGraph.axisY = null - surfaceGraph.axisZ = null - } - } - - NewButton { - id: clearSelectionsButton - Layout.fillHeight: true - Layout.fillWidth: true - text: "Clear Selections" - onClicked: { - barGraph.clearSelection() - scatterGraph.clearSelection() - surfaceGraph.clearSelection() - } - } - } - - Rectangle { - id: emptySpace - width: parent.width / 2 - height: parent.height / 8 - anchors.top: buttonLayout.bottom - anchors.left: parent.left - color: "#55555500" - } - - Item { - id: emptySpace2 - width: emptySpace.width - height: emptySpace.height - anchors.top: buttonLayout.bottom - anchors.left: emptySpace.right - } -} diff --git a/tests/qmlmultigraph/qml/qmlmultigraph/newbutton.qml b/tests/qmlmultigraph/qml/qmlmultigraph/newbutton.qml deleted file mode 100644 index e44c9d1a..00000000 --- a/tests/qmlmultigraph/qml/qmlmultigraph/newbutton.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the QtDataVisualization module. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** -****************************************************************************/ - -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/qmlmultigraph/qmlmultigraph.pro b/tests/qmlmultigraph/qmlmultigraph.pro deleted file mode 100644 index 1aca51c0..00000000 --- a/tests/qmlmultigraph/qmlmultigraph.pro +++ /dev/null @@ -1,25 +0,0 @@ -!include( ../tests.pri ) { - error( "Couldn't find the tests.pri file!" ) -} - -QT += widgets - -# Add more folders to ship with the application, here -folder_01.source = qml/qmlmultigraph -folder_01.target = qml -DEPLOYMENTFOLDERS = folder_01 - -# Additional import path used to resolve QML modules in Creator's code model -QML_IMPORT_PATH = - -# The .cpp file which was generated for your project. Feel free to hack it. -SOURCES += main.cpp - -# Please do not modify the following two lines. Required for deployment. -include(qtquick2applicationviewer/qtquick2applicationviewer.pri) -qtcAddDeployment() - -RESOURCES += qmlmultigraph.qrc - -OTHER_FILES += doc/src/* \ - doc/images/* diff --git a/tests/qmlmultigraph/qmlmultigraph.qrc b/tests/qmlmultigraph/qmlmultigraph.qrc deleted file mode 100644 index 78a5f993..00000000 --- a/tests/qmlmultigraph/qmlmultigraph.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - qml/qmlmultigraph/main.qml - qml/qmlmultigraph/newbutton.qml - - diff --git a/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp deleted file mode 100644 index 10709d7a..00000000 --- a/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// checksum 0x4f6f version 0x90005 -/* - This file was generated by the Qt Quick 2 Application wizard of Qt Creator. - QtQuick2ApplicationViewer is a convenience class containing mobile device specific - code such as screen orientation handling. Also QML paths and debugging are - handled here. - It is recommended not to modify this file, since newer versions of Qt Creator - may offer an updated version of it. -*/ - -#include "qtquick2applicationviewer.h" - -#include -#include -#include - -class QtQuick2ApplicationViewerPrivate -{ - QString mainQmlFile; - friend class QtQuick2ApplicationViewer; - static QString adjustPath(const QString &path); -}; - -QString QtQuick2ApplicationViewerPrivate::adjustPath(const QString &path) -{ -#if defined(Q_OS_MAC) - if (!QDir::isAbsolutePath(path)) - return QString::fromLatin1("%1/../Resources/%2") - .arg(QCoreApplication::applicationDirPath(), path); -#elif defined(Q_OS_BLACKBERRY) - if (!QDir::isAbsolutePath(path)) - return QString::fromLatin1("app/native/%1").arg(path); -#elif !defined(Q_OS_ANDROID) - QString pathInInstallDir = - QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path); - if (QFileInfo(pathInInstallDir).exists()) - return pathInInstallDir; - pathInInstallDir = - QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path); - if (QFileInfo(pathInInstallDir).exists()) - return pathInInstallDir; -#endif - return path; -} - -QtQuick2ApplicationViewer::QtQuick2ApplicationViewer(QWindow *parent) - : QQuickView(parent) - , d(new QtQuick2ApplicationViewerPrivate()) -{ - connect(engine(), SIGNAL(quit()), SLOT(close())); - setResizeMode(QQuickView::SizeRootObjectToView); -} - -QtQuick2ApplicationViewer::~QtQuick2ApplicationViewer() -{ - delete d; -} - -void QtQuick2ApplicationViewer::setMainQmlFile(const QString &file) -{ - d->mainQmlFile = QtQuick2ApplicationViewerPrivate::adjustPath(file); -#ifdef Q_OS_ANDROID - setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile)); -#else - setSource(QUrl::fromLocalFile(d->mainQmlFile)); -#endif -} - -void QtQuick2ApplicationViewer::addImportPath(const QString &path) -{ - engine()->addImportPath(QtQuick2ApplicationViewerPrivate::adjustPath(path)); -} - -void QtQuick2ApplicationViewer::showExpanded() -{ -#if defined(Q_WS_SIMULATOR) || defined(Q_OS_QNX) - showFullScreen(); -#else - show(); -#endif -} diff --git a/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h b/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h deleted file mode 100644 index cf66f140..00000000 --- a/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.h +++ /dev/null @@ -1,33 +0,0 @@ -// checksum 0xfde6 version 0x90005 -/* - This file was generated by the Qt Quick 2 Application wizard of Qt Creator. - QtQuick2ApplicationViewer is a convenience class containing mobile device specific - code such as screen orientation handling. Also QML paths and debugging are - handled here. - It is recommended not to modify this file, since newer versions of Qt Creator - may offer an updated version of it. -*/ - -#ifndef QTQUICK2APPLICATIONVIEWER_H -#define QTQUICK2APPLICATIONVIEWER_H - -#include - -class QtQuick2ApplicationViewer : public QQuickView -{ - Q_OBJECT - -public: - explicit QtQuick2ApplicationViewer(QWindow *parent = 0); - virtual ~QtQuick2ApplicationViewer(); - - void setMainQmlFile(const QString &file); - void addImportPath(const QString &path); - - void showExpanded(); - -private: - class QtQuick2ApplicationViewerPrivate *d; -}; - -#endif // QTQUICK2APPLICATIONVIEWER_H diff --git a/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri b/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri deleted file mode 100644 index e5f7990f..00000000 --- a/tests/qmlmultigraph/qtquick2applicationviewer/qtquick2applicationviewer.pri +++ /dev/null @@ -1,180 +0,0 @@ -# checksum 0x7b0d version 0x90005 -# This file was generated by the Qt Quick 2 Application wizard of Qt Creator. -# The code below adds the QtQuick2ApplicationViewer to the project and handles -# the activation of QML debugging. -# It is recommended not to modify this file, since newer versions of Qt Creator -# may offer an updated version of it. - -QT += qml quick - -SOURCES += $$PWD/qtquick2applicationviewer.cpp -HEADERS += $$PWD/qtquick2applicationviewer.h -INCLUDEPATH += $$PWD -# This file was generated by an application wizard of Qt Creator. -# The code below handles deployment to Android and Maemo, aswell as copying -# of the application data to shadow build directories on desktop. -# It is recommended not to modify this file, since newer versions of Qt Creator -# may offer an updated version of it. - -defineTest(qtcAddDeployment) { -for(deploymentfolder, DEPLOYMENTFOLDERS) { - item = item$${deploymentfolder} - greaterThan(QT_MAJOR_VERSION, 4) { - itemsources = $${item}.files - } else { - itemsources = $${item}.sources - } - $$itemsources = $$eval($${deploymentfolder}.source) - itempath = $${item}.path - $$itempath= $$eval($${deploymentfolder}.target) - export($$itemsources) - export($$itempath) - DEPLOYMENT += $$item -} - -MAINPROFILEPWD = $$PWD - -android-no-sdk { - for(deploymentfolder, DEPLOYMENTFOLDERS) { - item = item$${deploymentfolder} - itemfiles = $${item}.files - $$itemfiles = $$eval($${deploymentfolder}.source) - itempath = $${item}.path - $$itempath = /data/user/qt/$$eval($${deploymentfolder}.target) - export($$itemfiles) - export($$itempath) - INSTALLS += $$item - } - - target.path = /data/user/qt - - export(target.path) - INSTALLS += target -} else:android { - for(deploymentfolder, DEPLOYMENTFOLDERS) { - item = item$${deploymentfolder} - itemfiles = $${item}.files - $$itemfiles = $$eval($${deploymentfolder}.source) - itempath = $${item}.path - $$itempath = /assets/$$eval($${deploymentfolder}.target) - export($$itemfiles) - export($$itempath) - INSTALLS += $$item - } - - x86 { - target.path = /libs/x86 - } else: armeabi-v7a { - target.path = /libs/armeabi-v7a - } else { - target.path = /libs/armeabi - } - - export(target.path) - INSTALLS += target -} else:win32 { - copyCommand = - for(deploymentfolder, DEPLOYMENTFOLDERS) { - source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) - source = $$replace(source, /, \\) - sourcePathSegments = $$split(source, \\) - target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments) - target = $$replace(target, /, \\) - target ~= s,\\\\\\.?\\\\,\\, - !isEqual(source,$$target) { - !isEmpty(copyCommand):copyCommand += && - isEqual(QMAKE_DIR_SEP, \\) { - copyCommand += $(COPY_DIR) \"$$source\" \"$$target\" - } else { - source = $$replace(source, \\\\, /) - target = $$OUT_PWD/$$eval($${deploymentfolder}.target) - target = $$replace(target, \\\\, /) - copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\" - } - } - } - !isEmpty(copyCommand) { - copyCommand = @echo Copying application data... && $$copyCommand - copydeploymentfolders.commands = $$copyCommand - first.depends = $(first) copydeploymentfolders - export(first.depends) - export(copydeploymentfolders.commands) - QMAKE_EXTRA_TARGETS += first copydeploymentfolders - } -} else:unix { - maemo5 { - desktopfile.files = $${TARGET}.desktop - desktopfile.path = /usr/share/applications/hildon - icon.files = $${TARGET}64.png - icon.path = /usr/share/icons/hicolor/64x64/apps - } else:!isEmpty(MEEGO_VERSION_MAJOR) { - desktopfile.files = $${TARGET}_harmattan.desktop - desktopfile.path = /usr/share/applications - icon.files = $${TARGET}80.png - icon.path = /usr/share/icons/hicolor/80x80/apps - } else { # Assumed to be a Desktop Unix - copyCommand = - for(deploymentfolder, DEPLOYMENTFOLDERS) { - source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) - source = $$replace(source, \\\\, /) - macx { - target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target) - } else { - target = $$OUT_PWD/$$eval($${deploymentfolder}.target) - } - target = $$replace(target, \\\\, /) - sourcePathSegments = $$split(source, /) - targetFullPath = $$target/$$last(sourcePathSegments) - targetFullPath ~= s,/\\.?/,/, - !isEqual(source,$$targetFullPath) { - !isEmpty(copyCommand):copyCommand += && - copyCommand += $(MKDIR) \"$$target\" - copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\" - } - } - !isEmpty(copyCommand) { - copyCommand = @echo Copying application data... && $$copyCommand - copydeploymentfolders.commands = $$copyCommand - first.depends = $(first) copydeploymentfolders - export(first.depends) - export(copydeploymentfolders.commands) - QMAKE_EXTRA_TARGETS += first copydeploymentfolders - } - } - !isEmpty(target.path) { - installPrefix = $${target.path} - } else { - installPrefix = /opt/$${TARGET} - } - for(deploymentfolder, DEPLOYMENTFOLDERS) { - item = item$${deploymentfolder} - itemfiles = $${item}.files - $$itemfiles = $$eval($${deploymentfolder}.source) - itempath = $${item}.path - $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target) - export($$itemfiles) - export($$itempath) - INSTALLS += $$item - } - - !isEmpty(desktopfile.path) { - export(icon.files) - export(icon.path) - export(desktopfile.files) - export(desktopfile.path) - INSTALLS += icon desktopfile - } - - isEmpty(target.path) { - target.path = $${installPrefix}/bin - export(target.path) - } - INSTALLS += target -} - -export (ICON) -export (INSTALLS) -export (DEPLOYMENT) -export (LIBS) -export (QMAKE_EXTRA_TARGETS) -} diff --git a/tests/tests.pro b/tests/tests.pro index 41c0bee9..ec28d997 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -13,7 +13,6 @@ SUBDIRS += barstest \ qmlcamera \ qmldynamicdata \ multigraphs \ - qmlmultigraph \ directional #SUBDIRS += kinectsurface -- cgit v1.2.3