summaryrefslogtreecommitdiffstats
path: root/tests/qmlcamera
diff options
context:
space:
mode:
Diffstat (limited to 'tests/qmlcamera')
-rw-r--r--tests/qmlcamera/main.cpp28
-rw-r--r--tests/qmlcamera/qml/qmlcamera/Data.qml147
-rw-r--r--tests/qmlcamera/qml/qmlcamera/main.qml26
-rw-r--r--tests/qmlcamera/qmlcamera.desktop11
-rw-r--r--tests/qmlcamera/qmlcamera.pro29
-rw-r--r--tests/qmlcamera/qmlcamera.qrc9
-rw-r--r--tests/qmlcamera/qmlcamera64.pngbin3400 -> 0 bytes
-rw-r--r--tests/qmlcamera/qmlcamera80.pngbin4945 -> 0 bytes
-rw-r--r--tests/qmlcamera/qmlcamera_harmattan.desktop11
-rw-r--r--tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.cpp81
-rw-r--r--tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.h33
-rw-r--r--tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.pri180
12 files changed, 107 insertions, 448 deletions
diff --git a/tests/qmlcamera/main.cpp b/tests/qmlcamera/main.cpp
index c93502f7..040eaed3 100644
--- a/tests/qmlcamera/main.cpp
+++ b/tests/qmlcamera/main.cpp
@@ -16,30 +16,30 @@
**
****************************************************************************/
-#include <QtDataVisualization/qutils.h>
#include <QtGui/QGuiApplication>
-#include "qtquick2applicationviewer.h"
+#include <QtCore/QDir>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
int main(int argc, char *argv[])
{
QGuiApplication app(argc, argv);
- QtQuick2ApplicationViewer viewer;
+ QQuickView 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")));
+ // The following are needed to make examples run without having to install the module
+ // in desktop environments.
+#ifdef Q_OS_WIN
+ QString extraImportPath(QStringLiteral("%1/../../../%2"));
#else
- viewer.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(),
- QString::fromLatin1("qml")));
+ QString extraImportPath(QStringLiteral("%1/../../%2"));
#endif
- viewer.setMainQmlFile(QStringLiteral("qml/qmlcamera/main.qml"));
+ viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(),
+ QString::fromLatin1("qml")));
+
+ viewer.setSource(QUrl("qrc:/qml/qmlcamera/main.qml"));
viewer.setResizeMode(QQuickView::SizeRootObjectToView);
- viewer.showExpanded();
+ viewer.show();
return app.exec();
}
diff --git a/tests/qmlcamera/qml/qmlcamera/Data.qml b/tests/qmlcamera/qml/qmlcamera/Data.qml
index 3c787186..bab6bf78 100644
--- a/tests/qmlcamera/qml/qmlcamera/Data.qml
+++ b/tests/qmlcamera/qml/qmlcamera/Data.qml
@@ -30,41 +30,44 @@ Item {
rowRole: "year"
columnRole: "month"
valueRole: "expenses"
+ rotationRole: "angle"
}
Bar3DSeries {
id: barSeries
dataProxy: modelProxy
itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel"
+
+ onMeshAngleChanged: console.log("angle changed:", angle)
}
ListModel {
id: dataModel
- ListElement{ year: "2006"; month: "Jan"; expenses: "4"; income: "5" }
- ListElement{ year: "2006"; month: "Feb"; expenses: "5"; income: "6" }
- ListElement{ year: "2006"; month: "Mar"; expenses: "7"; income: "4" }
- ListElement{ year: "2006"; month: "Apr"; expenses: "3"; income: "2" }
- ListElement{ year: "2006"; month: "May"; expenses: "4"; income: "1" }
- ListElement{ year: "2006"; month: "Jun"; expenses: "2"; income: "2" }
- ListElement{ year: "2006"; month: "Jul"; expenses: "1"; income: "3" }
- ListElement{ year: "2006"; month: "Aug"; expenses: "5"; income: "1" }
- ListElement{ year: "2006"; month: "Sep"; expenses: "2"; income: "3" }
- ListElement{ year: "2006"; month: "Oct"; expenses: "5"; income: "2" }
- ListElement{ year: "2006"; month: "Nov"; expenses: "8"; income: "5" }
- ListElement{ year: "2006"; month: "Dec"; expenses: "3"; income: "3" }
+ ListElement{ year: "2006"; month: "Jan"; expenses: "4"; angle: "1"; income: "5" }
+ ListElement{ year: "2006"; month: "Feb"; expenses: "5"; angle: "2"; income: "6" }
+ ListElement{ year: "2006"; month: "Mar"; expenses: "7"; angle: "3"; income: "4" }
+ ListElement{ year: "2006"; month: "Apr"; expenses: "3"; angle: "4"; income: "2" }
+ ListElement{ year: "2006"; month: "May"; expenses: "4"; angle: "5"; income: "1" }
+ ListElement{ year: "2006"; month: "Jun"; expenses: "2"; angle: "6"; income: "2" }
+ ListElement{ year: "2006"; month: "Jul"; expenses: "1"; angle: "7"; income: "3" }
+ ListElement{ year: "2006"; month: "Aug"; expenses: "5"; angle: "8"; income: "1" }
+ ListElement{ year: "2006"; month: "Sep"; expenses: "2"; angle: "9"; income: "3" }
+ ListElement{ year: "2006"; month: "Oct"; expenses: "5"; angle: "10"; income: "2" }
+ ListElement{ year: "2006"; month: "Nov"; expenses: "8"; angle: "11"; income: "5" }
+ ListElement{ year: "2006"; month: "Dec"; expenses: "3"; angle: "12"; income: "3" }
- ListElement{ year: "2007"; month: "Jan"; expenses: "3"; income: "1" }
- ListElement{ year: "2007"; month: "Feb"; expenses: "4"; income: "2" }
- ListElement{ year: "2007"; month: "Mar"; expenses: "12"; income: "4" }
- ListElement{ year: "2007"; month: "Apr"; expenses: "13"; income: "6" }
- ListElement{ year: "2007"; month: "May"; expenses: "14"; income: "11" }
- ListElement{ year: "2007"; month: "Jun"; expenses: "7"; income: "7" }
- ListElement{ year: "2007"; month: "Jul"; expenses: "6"; income: "4" }
- ListElement{ year: "2007"; month: "Aug"; expenses: "4"; income: "15" }
- ListElement{ year: "2007"; month: "Sep"; expenses: "2"; income: "18" }
- ListElement{ year: "2007"; month: "Oct"; expenses: "29"; income: "25" }
- ListElement{ year: "2007"; month: "Nov"; expenses: "23"; income: "29" }
- ListElement{ year: "2007"; month: "Dec"; expenses: "5"; income: "9" }
+ ListElement{ year: "2007"; month: "Jan"; expenses: "3"; angle: "13"; income: "1" }
+ ListElement{ year: "2007"; month: "Feb"; expenses: "4"; angle: "14"; income: "2" }
+ ListElement{ year: "2007"; month: "Mar"; expenses: "12";angle: "15"; income: "4" }
+ ListElement{ year: "2007"; month: "Apr"; expenses: "13";angle: "16"; income: "6" }
+ ListElement{ year: "2007"; month: "May"; expenses: "14";angle: "17"; income: "11" }
+ ListElement{ year: "2007"; month: "Jun"; expenses: "7"; angle: "18"; income: "7" }
+ ListElement{ year: "2007"; month: "Jul"; expenses: "6"; angle: "19"; income: "4" }
+ ListElement{ year: "2007"; month: "Aug"; expenses: "4"; angle: "20"; income: "15" }
+ ListElement{ year: "2007"; month: "Sep"; expenses: "2"; angle: "21"; income: "18" }
+ ListElement{ year: "2007"; month: "Oct"; expenses: "29";angle: "22"; income: "25" }
+ ListElement{ year: "2007"; month: "Nov"; expenses: "23";angle: "23"; income: "29" }
+ ListElement{ year: "2007"; month: "Dec"; expenses: "5"; angle: "24"; income: "9" }
ListElement{ year: "2008"; month: "Jan"; expenses: "3"; income: "8" }
ListElement{ year: "2008"; month: "Feb"; expenses: "8"; income: "14" }
@@ -79,56 +82,56 @@ Item {
ListElement{ year: "2008"; month: "Nov"; expenses: "16"; income: "25" }
ListElement{ year: "2008"; month: "Dec"; expenses: "2"; income: "7" }
- ListElement{ year: "2009"; month: "Jan"; expenses: "4"; income: "5" }
- ListElement{ year: "2009"; month: "Feb"; expenses: "4"; income: "7" }
- ListElement{ year: "2009"; month: "Mar"; expenses: "11"; income: "14" }
- ListElement{ year: "2009"; month: "Apr"; expenses: "16"; income: "22" }
- ListElement{ year: "2009"; month: "May"; expenses: "3"; income: "5" }
- ListElement{ year: "2009"; month: "Jun"; expenses: "4"; income: "8" }
- ListElement{ year: "2009"; month: "Jul"; expenses: "7"; income: "9" }
- ListElement{ year: "2009"; month: "Aug"; expenses: "9"; income: "13" }
- ListElement{ year: "2009"; month: "Sep"; expenses: "1"; income: "6" }
- ListElement{ year: "2009"; month: "Oct"; expenses: "14"; income: "25" }
- ListElement{ year: "2009"; month: "Nov"; expenses: "19"; income: "29" }
- ListElement{ year: "2009"; month: "Dec"; expenses: "5"; income: "7" }
+ ListElement{ year: "2009"; month: "Jan"; expenses: "4"; angle: "37"; income: "5" }
+ ListElement{ year: "2009"; month: "Feb"; expenses: "4"; angle: "38"; income: "7" }
+ ListElement{ year: "2009"; month: "Mar"; expenses: "11";angle: "39"; income: "14" }
+ ListElement{ year: "2009"; month: "Apr"; expenses: "16";angle: "40"; income: "22" }
+ ListElement{ year: "2009"; month: "May"; expenses: "3"; angle: "41"; income: "5" }
+ ListElement{ year: "2009"; month: "Jun"; expenses: "4"; angle: "42"; income: "8" }
+ ListElement{ year: "2009"; month: "Jul"; expenses: "7"; angle: "43"; income: "9" }
+ ListElement{ year: "2009"; month: "Aug"; expenses: "9"; angle: "44"; income: "13" }
+ ListElement{ year: "2009"; month: "Sep"; expenses: "1"; angle: "45"; income: "6" }
+ ListElement{ year: "2009"; month: "Oct"; expenses: "14";angle: "46"; income: "25" }
+ ListElement{ year: "2009"; month: "Nov"; expenses: "19";angle: "47"; income: "29" }
+ ListElement{ year: "2009"; month: "Dec"; expenses: "5"; angle: "48"; income: "7" }
- ListElement{ year: "2010"; month: "Jan"; expenses: "14"; income: "22" }
- ListElement{ year: "2010"; month: "Feb"; expenses: "5"; income: "7" }
- ListElement{ year: "2010"; month: "Mar"; expenses: "1"; income: "9" }
- ListElement{ year: "2010"; month: "Apr"; expenses: "1"; income: "12" }
- ListElement{ year: "2010"; month: "May"; expenses: "5"; income: "9" }
- ListElement{ year: "2010"; month: "Jun"; expenses: "5"; income: "8" }
- ListElement{ year: "2010"; month: "Jul"; expenses: "3"; income: "7" }
- ListElement{ year: "2010"; month: "Aug"; expenses: "1"; income: "5" }
- ListElement{ year: "2010"; month: "Sep"; expenses: "2"; income: "4" }
- ListElement{ year: "2010"; month: "Oct"; expenses: "10"; income: "13" }
- ListElement{ year: "2010"; month: "Nov"; expenses: "12"; income: "17" }
- ListElement{ year: "2010"; month: "Dec"; expenses: "6"; income: "9" }
+ ListElement{ year: "2010"; month: "Jan"; expenses: "14";angle: "49"; income: "22" }
+ ListElement{ year: "2010"; month: "Feb"; expenses: "5"; angle: "50"; income: "7" }
+ ListElement{ year: "2010"; month: "Mar"; expenses: "1"; angle: "51"; income: "9" }
+ ListElement{ year: "2010"; month: "Apr"; expenses: "1"; angle: "52"; income: "12" }
+ ListElement{ year: "2010"; month: "May"; expenses: "5"; angle: "53"; income: "9" }
+ ListElement{ year: "2010"; month: "Jun"; expenses: "5"; angle: "54"; income: "8" }
+ ListElement{ year: "2010"; month: "Jul"; expenses: "3"; angle: "55"; income: "7" }
+ ListElement{ year: "2010"; month: "Aug"; expenses: "1"; angle: "56"; income: "5" }
+ ListElement{ year: "2010"; month: "Sep"; expenses: "2"; angle: "57"; income: "4" }
+ ListElement{ year: "2010"; month: "Oct"; expenses: "10";angle: "58"; income: "13" }
+ ListElement{ year: "2010"; month: "Nov"; expenses: "12";angle: "59"; income: "17" }
+ ListElement{ year: "2010"; month: "Dec"; expenses: "6"; angle: "60"; income: "9" }
- ListElement{ year: "2011"; month: "Jan"; expenses: "2"; income: "6" }
- ListElement{ year: "2011"; month: "Feb"; expenses: "4"; income: "8" }
- ListElement{ year: "2011"; month: "Mar"; expenses: "7"; income: "12" }
- ListElement{ year: "2011"; month: "Apr"; expenses: "9"; income: "15" }
- ListElement{ year: "2011"; month: "May"; expenses: "7"; income: "19" }
- ListElement{ year: "2011"; month: "Jun"; expenses: "9"; income: "18" }
- ListElement{ year: "2011"; month: "Jul"; expenses: "13"; income: "17" }
- ListElement{ year: "2011"; month: "Aug"; expenses: "5"; income: "9" }
- ListElement{ year: "2011"; month: "Sep"; expenses: "3"; income: "8" }
- ListElement{ year: "2011"; month: "Oct"; expenses: "13"; income: "15" }
- ListElement{ year: "2011"; month: "Nov"; expenses: "8"; income: "17" }
- ListElement{ year: "2011"; month: "Dec"; expenses: "7"; income: "10" }
+ ListElement{ year: "2011"; month: "Jan"; expenses: "2"; angle: "61"; income: "6" }
+ ListElement{ year: "2011"; month: "Feb"; expenses: "4"; angle: "62"; income: "8" }
+ ListElement{ year: "2011"; month: "Mar"; expenses: "7"; angle: "63"; income: "12" }
+ ListElement{ year: "2011"; month: "Apr"; expenses: "9"; angle: "64"; income: "15" }
+ ListElement{ year: "2011"; month: "May"; expenses: "7"; angle: "65"; income: "19" }
+ ListElement{ year: "2011"; month: "Jun"; expenses: "9"; angle: "66"; income: "18" }
+ ListElement{ year: "2011"; month: "Jul"; expenses: "13";angle: "67"; income: "17" }
+ ListElement{ year: "2011"; month: "Aug"; expenses: "5"; angle: "68"; income: "9" }
+ ListElement{ year: "2011"; month: "Sep"; expenses: "3"; angle: "69"; income: "8" }
+ ListElement{ year: "2011"; month: "Oct"; expenses: "13";angle: "70"; income: "15" }
+ ListElement{ year: "2011"; month: "Nov"; expenses: "8"; angle: "71"; income: "17" }
+ ListElement{ year: "2011"; month: "Dec"; expenses: "7"; angle: "72"; income: "10" }
- ListElement{ year: "2012"; month: "Jan"; expenses: "12"; income: "16" }
- ListElement{ year: "2012"; month: "Feb"; expenses: "24"; income: "28" }
- ListElement{ year: "2012"; month: "Mar"; expenses: "27"; income: "22" }
- ListElement{ year: "2012"; month: "Apr"; expenses: "29"; income: "25" }
- ListElement{ year: "2012"; month: "May"; expenses: "27"; income: "29" }
- ListElement{ year: "2012"; month: "Jun"; expenses: "19"; income: "18" }
- ListElement{ year: "2012"; month: "Jul"; expenses: "13"; income: "17" }
- ListElement{ year: "2012"; month: "Aug"; expenses: "15"; income: "19" }
- ListElement{ year: "2012"; month: "Sep"; expenses: "3"; income: "8" }
- ListElement{ year: "2012"; month: "Oct"; expenses: "3"; income: "6" }
- ListElement{ year: "2012"; month: "Nov"; expenses: "4"; income: "8" }
- ListElement{ year: "2012"; month: "Dec"; expenses: "5"; income: "9" }
+ ListElement{ year: "2012"; month: "Jan"; expenses: "12";angle: "73"; income: "16" }
+ ListElement{ year: "2012"; month: "Feb"; expenses: "24";angle: "74"; income: "28" }
+ ListElement{ year: "2012"; month: "Mar"; expenses: "27";angle: "75"; income: "22" }
+ ListElement{ year: "2012"; month: "Apr"; expenses: "29";angle: "76"; income: "25" }
+ ListElement{ year: "2012"; month: "May"; expenses: "27";angle: "77"; income: "29" }
+ ListElement{ year: "2012"; month: "Jun"; expenses: "19";angle: "78"; income: "18" }
+ ListElement{ year: "2012"; month: "Jul"; expenses: "13";angle: "79"; income: "17" }
+ ListElement{ year: "2012"; month: "Aug"; expenses: "15";angle: "80"; income: "19" }
+ ListElement{ year: "2012"; month: "Sep"; expenses: "3"; angle: "81"; income: "8" }
+ ListElement{ year: "2012"; month: "Oct"; expenses: "3"; angle: "82"; income: "6" }
+ ListElement{ year: "2012"; month: "Nov"; expenses: "4"; angle: "83"; income: "8" }
+ ListElement{ year: "2012"; month: "Dec"; expenses: "5"; angle: "84"; income: "9" }
}
}
diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml
index a5176553..264d613e 100644
--- a/tests/qmlcamera/qml/qmlcamera/main.qml
+++ b/tests/qmlcamera/qml/qmlcamera/main.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls 1.0
import QtDataVisualization 1.0
import "."
-Item {
+Rectangle {
id: mainview
width: 1280
height: 1024
@@ -99,10 +99,10 @@ Item {
y: 0
width: 298
height: 298
- minXValue: testChart.scene.activeCamera.minXRotation
- minYValue: testChart.scene.activeCamera.minYRotation
- maxXValue: testChart.scene.activeCamera.maxXRotation
- maxYValue: testChart.scene.activeCamera.maxYRotation
+ minXValue: -180
+ minYValue: 0
+ maxXValue: 180
+ maxYValue: 90
}
Slider {
@@ -133,24 +133,20 @@ Item {
}
Button {
- id: shadowToggle
+ id: angleAdjust
anchors.bottom: mappingToggle.top
width: camControlArea.width
- text: "Hide Shadows"
+ text: "Adjust angle"
+ property real currentAngle: 0
onClicked: {
- if (testChart.shadowQuality == AbstractGraph3D.ShadowQualityNone) {
- testChart.shadowQuality = AbstractGraph3D.ShadowQualityMedium;
- text = "Hide Shadows"
- } else {
- testChart.shadowQuality = AbstractGraph3D.ShadowQualityNone;
- text = "Show Shadows"
- }
+ currentAngle += 5
+ chartData.series.meshAngle = currentAngle
}
}
Button {
id: dataToggle
- anchors.bottom: shadowToggle.top
+ anchors.bottom: angleAdjust.top
width: camControlArea.width
text: "Show 2010 - 2012"
onClicked: {
diff --git a/tests/qmlcamera/qmlcamera.desktop b/tests/qmlcamera/qmlcamera.desktop
deleted file mode 100644
index 10a0a2e7..00000000
--- a/tests/qmlcamera/qmlcamera.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=qmlcamera
-Exec=/opt/qmlcamera/bin/qmlcamera
-Icon=qmlcamera64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/tests/qmlcamera/qmlcamera.pro b/tests/qmlcamera/qmlcamera.pro
index 374dc012..098d7a85 100644
--- a/tests/qmlcamera/qmlcamera.pro
+++ b/tests/qmlcamera/qmlcamera.pro
@@ -2,34 +2,9 @@
error( "Couldn't find the tests.pri file!" )
}
-# Add more folders to ship with the application, here
-folder_01.source = qml/qmlcamera
-folder_01.target = qml
-DEPLOYMENTFOLDERS = folder_01
-
-# Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
-
-# If your application uses the Qt Mobility libraries, uncomment the following
-# lines and add the respective components to the MOBILITY variable.
-# CONFIG += mobility
-# MOBILITY +=
-
-# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp
-# Installation path
-# target.path =
-
-# Please do not modify the following two lines. Required for deployment.
-include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
-qtcAddDeployment()
+RESOURCES += qmlcamera.qrc
-RESOURCES += \
- qmlcamera.qrc
+OTHER_FILES += qml/qmlcamera/*
-OTHER_FILES += \
- qml/qmlcamera/Data.qml \
- qml/qmlcamera/Axes.qml \
- qml/qmlcamera/main.qml \
- qml/qmlcamera/ControlSurface.qml
diff --git a/tests/qmlcamera/qmlcamera.qrc b/tests/qmlcamera/qmlcamera.qrc
index d9b993c7..90cb0867 100644
--- a/tests/qmlcamera/qmlcamera.qrc
+++ b/tests/qmlcamera/qmlcamera.qrc
@@ -1,7 +1,8 @@
<RCC>
- <qresource prefix="/qml">
- <file alias="main.qml">qml/qmlcamera/main.qml</file>
- <file alias="Data.qml">qml/qmlcamera/Data.qml</file>
- <file alias="Axes.qml">qml/qmlcamera/Axes.qml</file>
+ <qresource prefix="/">
+ <file>qml/qmlcamera/Axes.qml</file>
+ <file>qml/qmlcamera/ControlSurface.qml</file>
+ <file>qml/qmlcamera/Data.qml</file>
+ <file>qml/qmlcamera/main.qml</file>
</qresource>
</RCC>
diff --git a/tests/qmlcamera/qmlcamera64.png b/tests/qmlcamera/qmlcamera64.png
deleted file mode 100644
index 707d5c4e..00000000
--- a/tests/qmlcamera/qmlcamera64.png
+++ /dev/null
Binary files differ
diff --git a/tests/qmlcamera/qmlcamera80.png b/tests/qmlcamera/qmlcamera80.png
deleted file mode 100644
index 6ad8096c..00000000
--- a/tests/qmlcamera/qmlcamera80.png
+++ /dev/null
Binary files differ
diff --git a/tests/qmlcamera/qmlcamera_harmattan.desktop b/tests/qmlcamera/qmlcamera_harmattan.desktop
deleted file mode 100644
index 8e9e9857..00000000
--- a/tests/qmlcamera/qmlcamera_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=qmlcamera
-Exec=/usr/bin/single-instance /opt/qmlcamera/bin/qmlcamera
-Icon=/usr/share/icons/hicolor/80x80/apps/qmlcamera80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.cpp b/tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.cpp
deleted file mode 100644
index 10709d7a..00000000
--- a/tests/qmlcamera/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 <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtQml/QQmlEngine>
-
-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/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.h b/tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.h
deleted file mode 100644
index cf66f140..00000000
--- a/tests/qmlcamera/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 <QtQuick/QQuickView>
-
-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/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.pri b/tests/qmlcamera/qtquick2applicationviewer/qtquick2applicationviewer.pri
deleted file mode 100644
index e5f7990f..00000000
--- a/tests/qmlcamera/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)
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 00:11:24 +0000