diff --git a/charts.pro b/charts.pro
index ef8d358..b4c4b7f 100644
--- a/charts.pro
+++ b/charts.pro
@@ -3,7 +3,7 @@
}
TEMPLATE = subdirs
-SUBDIRS += src examples demos test qmlplugin
+SUBDIRS += src qmlplugin examples demos test
integrated_build:{
message('Configured for integrated build against local libs...')
diff --git a/demos/demos.pro b/demos/demos.pro
index 9c4a5e8..eebabf8 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += chartthemes \
piechartcustomization \
- gdpbarchart
+ gdpbarchart \
+ qmlchart
diff --git a/demos/piechartcustomization/piechartcustomization.pro b/demos/piechartcustomization/piechartcustomization.pro
index c2fac07..8e240a1 100644
--- a/demos/piechartcustomization/piechartcustomization.pro
+++ b/demos/piechartcustomization/piechartcustomization.pro
@@ -1,5 +1,5 @@
!include( ../demos.pri ) {
- error( "Couldn't find the examples.pri file!" )
+ error( "Couldn't find the demos.pri file!" )
}
TARGET = piechartcustomization
SOURCES += main.cpp \
diff --git a/test/qmlchart/main.cpp b/demos/qmlchart/main.cpp
similarity index 100%
rename from test/qmlchart/main.cpp
rename to demos/qmlchart/main.cpp
diff --git a/test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
similarity index 100%
rename from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
rename to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
diff --git a/test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
similarity index 100%
rename from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
rename to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
diff --git a/test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
similarity index 100%
rename from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
rename to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
diff --git a/test/qmlchart/qmlchart.pro b/demos/qmlchart/qmlchart.pro
similarity index 91%
rename from test/qmlchart/qmlchart.pro
rename to demos/qmlchart/qmlchart.pro
index bbc9367..ba3d623 100644
--- a/test/qmlchart/qmlchart.pro
+++ b/demos/qmlchart/qmlchart.pro
@@ -1,5 +1,5 @@
-!include( ../test.pri ) {
- error( "Couldn't find the common.pri file!" )
+!include( ../demos.pri ) {
+ error( "Couldn't find the demos.pri file!" )
}
integrated_build:{
@@ -46,7 +46,3 @@ SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
include(qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
-
-#HEADERS += \
-# chart.h
-
diff --git a/test/qmlchart/qmlchart.svg b/demos/qmlchart/qmlchart.svg
similarity index 100%
rename from test/qmlchart/qmlchart.svg
rename to demos/qmlchart/qmlchart.svg
diff --git a/test/qmlchart/resources.qrc b/demos/qmlchart/resources.qrc
similarity index 94%
rename from test/qmlchart/resources.qrc
rename to demos/qmlchart/resources.qrc
index 82eb434..ecec535 100644
--- a/test/qmlchart/resources.qrc
+++ b/demos/qmlchart/resources.qrc
@@ -5,6 +5,5 @@
qml/qmlchart/View1.qml
qml/qmlchart/View2.qml
qml/qmlchart/View3.qml
- qml/qmlchart/View4.qml
diff --git a/integrated.pri b/integrated.pri
index 9573ba2..242f446 100644
--- a/integrated.pri
+++ b/integrated.pri
@@ -42,31 +42,31 @@ integrated_build:{
CONFIG(debug, debug|release) {
CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
}
- TARGET_PATH = ""
+ BIN_TARGET_PATH = ""
exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
- TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
+ BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
}
exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
# Executable in test folder
- TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
+ BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
}
exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
# Executable in test folder with custom target "tst_NNN"
- TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
+ BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
}
exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
# Plugin
- TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
+ BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
}
- !isEmpty (TARGET_PATH) {
- QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$TARGET_PATH
- #message($$QMAKE_POST_LINK)
- }
-
- # Hack to make qml plugins available as internal build versions
- exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
- QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
- #message($$QMAKE_POST_LINK)
+ !isEmpty (BIN_TARGET_PATH) {
+ QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH
+ message($$QMAKE_POST_LINK)
+ } else {
+ # Hack to make qml plugins available as internal build versions
+ exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
+ QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
+ message($$QMAKE_POST_LINK)
+ }
}
}
diff --git a/test/qmlchart/qml/qmlchart/View1.qml b/test/qmlchart/qml/qmlchart/View1.qml
deleted file mode 100644
index 2f179a8..0000000
--- a/test/qmlchart/qml/qmlchart/View1.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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 Qt Commercial Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial 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
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.0
-
-Rectangle {
- anchors.fill: parent
-
- Chart {
- title: "Car brand shares in Finland"
- anchors.fill: parent
- theme: Chart.ChartThemeLight
-
- PieSeries {
- horizontalPosition: 0.2
- verticalPosition: 0.3
- size: 0.4
- slices: [
- PieSlice { label: "Volkswagen"; value: 13.5 },
- PieSlice { label: "Toyota"; value: 10.9 },
- PieSlice { label: "Ford"; value: 8.6 },
- PieSlice { label: "Skoda"; value: 8.2 },
- PieSlice { label: "Volvo"; value: 6.8 },
- PieSlice { label: "Others"; value: 52.0 }
- ]
- }
-
- BarSeries {
- barCategories: [ "2008", "2009", "2010", "2011", "2012" ]
- // data implementation missing
- }
- }
-}
diff --git a/test/qmlchart/qml/qmlchart/View2.qml b/test/qmlchart/qml/qmlchart/View2.qml
deleted file mode 100644
index 71f7731..0000000
--- a/test/qmlchart/qml/qmlchart/View2.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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 Qt Commercial Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial 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
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.0
-
-Rectangle {
- anchors.fill: parent
-
- Chart {
- title: "Line&Spline"
- anchors.fill: parent
- theme: Chart.ChartThemeBrownSand
-
- LineSeries {
- name: "Line"
- points: [
- XyPoint { x: 0.0; y: 0.0 },
- XyPoint { x: 1.1; y: 2.1 },
- XyPoint { x: 1.9; y: 3.3 },
- XyPoint { x: 2.9; y: 4.9 },
- XyPoint { x: 3.2; y: 3.0 },
- XyPoint { x: 4.0; y: 3.3 }
- ]
- }
-
- SplineSeries {
- name: "Spline"
- points: [
- XyPoint { x: 0.0; y: 0.3 },
- XyPoint { x: 1.1; y: 3.2 },
- XyPoint { x: 1.7; y: 2.4 },
- XyPoint { x: 2.1; y: 2.1 },
- XyPoint { x: 2.9; y: 2.6 },
- XyPoint { x: 3.4; y: 2.3 },
- XyPoint { x: 4.1; y: 3.1 }
- ]
- }
- }
-}
diff --git a/test/qmlchart/qml/qmlchart/View3.qml b/test/qmlchart/qml/qmlchart/View3.qml
deleted file mode 100644
index 32092cb..0000000
--- a/test/qmlchart/qml/qmlchart/View3.qml
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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 Qt Commercial Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial 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
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.0
-
-Rectangle {
- anchors.fill: parent
-
- Chart {
- title: "NHL All-Star Team Players"
- anchors.fill: parent
- theme: Chart.ChartThemeHighContrast
-
- AreaSeries {
- name: "Finnish"
- points: [
- XyPoint { x: 0; y: 0 },
- XyPoint { x: 1; y: 0 },
- XyPoint { x: 2; y: 0 },
- XyPoint { x: 3; y: 0 },
- XyPoint { x: 4; y: 0 },
- XyPoint { x: 5; y: 0 },
- XyPoint { x: 6; y: 1 },
- XyPoint { x: 7; y: 0 },
- XyPoint { x: 8; y: 0 },
- XyPoint { x: 9; y: 0 },
- XyPoint { x: 10; y: 0 },
- XyPoint { x: 11; y: 1 }
- ]
- lowerPoints: [
- XyPoint { x: 0; y: 0 },
- XyPoint { x: 1; y: 0 },
- XyPoint { x: 2; y: 0 },
- XyPoint { x: 3; y: 0 },
- XyPoint { x: 4; y: 0 },
- XyPoint { x: 5; y: 0 },
- XyPoint { x: 6; y: 0 },
- XyPoint { x: 7; y: 0 },
- XyPoint { x: 8; y: 0 },
- XyPoint { x: 9; y: 0 },
- XyPoint { x: 10; y: 0 },
- XyPoint { x: 11; y: 0 }
- ]
- }
-
- AreaSeries {
- name: "Russian"
- points: [
- XyPoint { x: 0; y: 1 },
- XyPoint { x: 1; y: 1 },
- XyPoint { x: 2; y: 1 },
- XyPoint { x: 3; y: 1 },
- XyPoint { x: 4; y: 1 },
- XyPoint { x: 5; y: 0 },
- XyPoint { x: 6; y: 1 },
- XyPoint { x: 7; y: 1 },
- XyPoint { x: 8; y: 4 },
- XyPoint { x: 9; y: 3 },
- XyPoint { x: 10; y: 2 },
- XyPoint { x: 11; y: 1 }
- ]
- lowerPoints: [
- XyPoint { x: 0; y: 0 },
- XyPoint { x: 1; y: 0 },
- XyPoint { x: 2; y: 0 },
- XyPoint { x: 3; y: 0 },
- XyPoint { x: 4; y: 0 },
- XyPoint { x: 5; y: 0 },
- XyPoint { x: 6; y: 0 },
- XyPoint { x: 7; y: 0 },
- XyPoint { x: 8; y: 0 },
- XyPoint { x: 9; y: 0 },
- XyPoint { x: 10; y: 0 },
- XyPoint { x: 11; y: 0 }
- ]
- }
-
- AreaSeries {
- name: "Swedish"
- points: [
- XyPoint { x: 0; y: 1 },
- XyPoint { x: 1; y: 1 },
- XyPoint { x: 2; y: 3 },
- XyPoint { x: 3; y: 3 },
- XyPoint { x: 4; y: 2 },
- XyPoint { x: 5; y: 0 },
- XyPoint { x: 6; y: 2 },
- XyPoint { x: 7; y: 1 },
- XyPoint { x: 8; y: 2 },
- XyPoint { x: 9; y: 1 },
- XyPoint { x: 10; y: 3 },
- XyPoint { x: 11; y: 3 }
- ]
- lowerPoints: [
- XyPoint { x: 0; y: 0 },
- XyPoint { x: 1; y: 0 },
- XyPoint { x: 2; y: 0 },
- XyPoint { x: 3; y: 0 },
- XyPoint { x: 4; y: 0 },
- XyPoint { x: 5; y: 0 },
- XyPoint { x: 6; y: 0 },
- XyPoint { x: 7; y: 0 },
- XyPoint { x: 8; y: 0 },
- XyPoint { x: 9; y: 0 },
- XyPoint { x: 10; y: 0 },
- XyPoint { x: 11; y: 0 }
- ]
- }
- }
-}
diff --git a/test/qmlchart/qml/qmlchart/View4.qml b/test/qmlchart/qml/qmlchart/View4.qml
deleted file mode 100644
index f1d297a..0000000
--- a/test/qmlchart/qml/qmlchart/View4.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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 Qt Commercial Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial 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
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.0
-
-Rectangle {
- anchors.fill: parent
-
- Chart {
- title: "Scatters"
- anchors.fill: parent
- theme: Chart.ChartThemeBlueCerulean
-
- ScatterSeries {
- id: scatter1
- name: "Scatter1"
- points: [
- XyPoint { x: 1.5; y: 1.5 },
- XyPoint { x: 1.5; y: 1.6 },
- XyPoint { x: 1.57; y: 1.55 },
- XyPoint { x: 1.8; y: 1.8 },
- XyPoint { x: 1.9; y: 1.6 },
- XyPoint { x: 2.1; y: 1.3 },
- XyPoint { x: 2.5; y: 2.1 }
- ]
- }
- ScatterSeries {
- name: "Scatter2"
- points: [
- XyPoint { x: 2.0; y: 2.0 },
- XyPoint { x: 2.0; y: 2.1 },
- XyPoint { x: 2.07; y: 2.05 },
- XyPoint { x: 2.2; y: 2.9 },
- XyPoint { x: 2.4; y: 2.7 },
- XyPoint { x: 2.67; y: 2.65 }
- ]
- }
- }
-}
diff --git a/test/qmlchart/qml/qmlchart/loader.qml b/test/qmlchart/qml/qmlchart/loader.qml
deleted file mode 100644
index 7668f0c..0000000
--- a/test/qmlchart/qml/qmlchart/loader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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 Qt Commercial Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial 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
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Item {
- id: container
- width: 400
- height: 300
- Component.onCompleted: {
- var co = Qt.createComponent("main.qml")
- if (co.status == Component.Ready) {
- var o = co.createObject(container)
- } else {
- console.log(co.errorString())
- console.log("QtCommercial.Chart 1.1 not available")
- console.log("Please use correct QML_IMPORT_PATH export")
- }
- }
-}
diff --git a/test/qmlchart/qml/qmlchart/main.qml b/test/qmlchart/qml/qmlchart/main.qml
deleted file mode 100644
index 0db7f73..0000000
--- a/test/qmlchart/qml/qmlchart/main.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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 Qt Commercial Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial 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
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.0
-
-Rectangle {
- width: parent.width
- height: parent.height
- property int __viewNumber: 0
-
- Timer {
- id: timer
- running: true
- repeat: true
- interval: 5000
- triggeredOnStart: false
- onTriggered: {
- __viewNumber++;
- }
- }
-
- Loader {
- id: loader
- anchors.fill: parent
- source: "View" + (__viewNumber % 4 + 1) + ".qml";
- }
-
- MouseArea {
- anchors.fill: parent
- onClicked: {
- timer.restart();
- __viewNumber++;
- }
- }
-}
diff --git a/test/qmlchart/qmlchart.desktop b/test/qmlchart/qmlchart.desktop
deleted file mode 100644
index 99ebae7..0000000
--- a/test/qmlchart/qmlchart.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=qmlchart
-Exec=/opt/qmlchart/bin/qmlchart
-Icon=qmlchart64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/test/qmlchart/qmlchart64.png b/test/qmlchart/qmlchart64.png
deleted file mode 100644
index 707d5c4e85d82959740b243a8a36d5071c277299..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@ht(u000b3
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
IC|gJU4?aG7DgXcg
diff --git a/test/qmlchart/qmlchart_harmattan.desktop b/test/qmlchart/qmlchart_harmattan.desktop
deleted file mode 100644
index 4203c09..0000000
--- a/test/qmlchart/qmlchart_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=qmlchart
-Exec=/usr/bin/single-instance /opt/qmlchart/bin/qmlchart
-Icon=/usr/share/icons/hicolor/80x80/apps/qmlchart80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/test/test.pro b/test/test.pro
index 4915769..a4486af 100644
--- a/test/test.pro
+++ b/test/test.pro
@@ -1,8 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += \
chartwidgettest \
- wavechart \
- qmlchart
+ wavechart
!win32:{
SUBDIRS += auto