##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Left-overs from QML model API change
Tero Ahola -
r1142:2246bb6a7b77
parent child
Show More
Side by Side Unified
Context file:
r1142:2246bb6a7b77 Loading diff...:
Show file before | Show file after | Hide comments
@@ -32,27 +32,27 Rectangle {
32
32
33 LineSeries {
33 LineSeries {
34 name: "Line"
34 name: "Line"
35 points: [
35 model: XYModel {
36 XyPoint { x: 0.0; y: 0.0 },
36 XyPoint { x: 0.0; y: 0.0 }
37 XyPoint { x: 1.1; y: 2.1 },
37 XyPoint { x: 1.1; y: 2.1 }
38 XyPoint { x: 1.9; y: 3.3 },
38 XyPoint { x: 1.9; y: 3.3 }
39 XyPoint { x: 2.9; y: 4.9 },
39 XyPoint { x: 2.9; y: 4.9 }
40 XyPoint { x: 3.2; y: 3.0 },
40 XyPoint { x: 3.2; y: 3.0 }
41 XyPoint { x: 4.0; y: 3.3 }
41 XyPoint { x: 4.0; y: 3.3 }
42 ]
42 }
43 }
43 }
44
44
45 SplineSeries {
45 SplineSeries {
46 name: "Spline"
46 name: "Spline"
47 points: [
47 model: XYModel {
48 XyPoint { x: 0.0; y: 0.3 },
48 XyPoint { x: 0.0; y: 0.3 }
49 XyPoint { x: 1.1; y: 3.2 },
49 XyPoint { x: 1.1; y: 3.2 }
50 XyPoint { x: 1.7; y: 2.4 },
50 XyPoint { x: 1.7; y: 2.4 }
51 XyPoint { x: 2.1; y: 2.1 },
51 XyPoint { x: 2.1; y: 2.1 }
52 XyPoint { x: 2.9; y: 2.6 },
52 XyPoint { x: 2.9; y: 2.6 }
53 XyPoint { x: 3.4; y: 2.3 },
53 XyPoint { x: 3.4; y: 2.3 }
54 XyPoint { x: 4.1; y: 3.1 }
54 XyPoint { x: 4.1; y: 3.1 }
55 ]
55 }
56 }
56 }
57 }
57 }
58 }
58 }
Show file before | Show file after | Hide comments
@@ -32,26 +32,26 Rectangle {
32 ScatterSeries {
32 ScatterSeries {
33 id: scatter1
33 id: scatter1
34 name: "Scatter1"
34 name: "Scatter1"
35 points: [
35 model: XYModel {
36 XyPoint { x: 1.5; y: 1.5 },
36 XyPoint { x: 1.5; y: 1.5 }
37 XyPoint { x: 1.5; y: 1.6 },
37 XyPoint { x: 1.5; y: 1.6 }
38 XyPoint { x: 1.57; y: 1.55 },
38 XyPoint { x: 1.57; y: 1.55 }
39 XyPoint { x: 1.8; y: 1.8 },
39 XyPoint { x: 1.8; y: 1.8 }
40 XyPoint { x: 1.9; y: 1.6 },
40 XyPoint { x: 1.9; y: 1.6 }
41 XyPoint { x: 2.1; y: 1.3 },
41 XyPoint { x: 2.1; y: 1.3 }
42 XyPoint { x: 2.5; y: 2.1 }
42 XyPoint { x: 2.5; y: 2.1 }
43 ]
43 }
44 }
44 }
45 ScatterSeries {
45 ScatterSeries {
46 name: "Scatter2"
46 name: "Scatter2"
47 points: [
47 model: XYModel {
48 XyPoint { x: 2.0; y: 2.0 },
48 XyPoint { x: 2.0; y: 2.0 }
49 XyPoint { x: 2.0; y: 2.1 },
49 XyPoint { x: 2.0; y: 2.1 }
50 XyPoint { x: 2.07; y: 2.05 },
50 XyPoint { x: 2.07; y: 2.05 }
51 XyPoint { x: 2.2; y: 2.9 },
51 XyPoint { x: 2.2; y: 2.9 }
52 XyPoint { x: 2.4; y: 2.7 },
52 XyPoint { x: 2.4; y: 2.7 }
53 XyPoint { x: 2.67; y: 2.65 }
53 XyPoint { x: 2.67; y: 2.65 }
54 ]
54 }
55 }
55 }
56 }
56 }
57 }
57 }
Show file before | Show file after | Hide comments
@@ -6,6 +6,5 RESOURCES += resources.qrc
6 SOURCES += main.cpp
6 SOURCES += main.cpp
7
7
8 include(qmlapplicationviewer/qmlapplicationviewer.pri)
8 include(qmlapplicationviewer/qmlapplicationviewer.pri)
9 #qtcAddDeployment()
10
9
11 !system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"
10 !system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"
General Comments 0
You need to be logged in to leave comments. Login now