diff --git a/demos/qmlchart/qml/qmlchart/View2.qml b/demos/qmlchart/qml/qmlchart/View2.qml index 379710b..e3d797b 100644 --- a/demos/qmlchart/qml/qmlchart/View2.qml +++ b/demos/qmlchart/qml/qmlchart/View2.qml @@ -32,27 +32,27 @@ Rectangle { 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 }, + model: XYModel { + 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 }, + model: XYModel { + 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/demos/qmlchart/qml/qmlchart/View4.qml b/demos/qmlchart/qml/qmlchart/View4.qml index bfac53b..171f039 100644 --- a/demos/qmlchart/qml/qmlchart/View4.qml +++ b/demos/qmlchart/qml/qmlchart/View4.qml @@ -32,26 +32,26 @@ Rectangle { 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 }, + model: XYModel { + 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 }, + model: XYModel { + 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/demos/qmlweather/qmlweather.pro b/demos/qmlweather/qmlweather.pro index 7d17f58..394db8f 100644 --- a/demos/qmlweather/qmlweather.pro +++ b/demos/qmlweather/qmlweather.pro @@ -6,6 +6,5 @@ RESOURCES += resources.qrc SOURCES += main.cpp include(qmlapplicationviewer/qmlapplicationviewer.pri) -#qtcAddDeployment() !system_build:mac: QMAKE_POST_LINK += "$$MAC_POST_LINK_PREFIX $$MAC_DEMOS_BIN_DIR"