@@ -1,32 +1,31 | |||
|
1 | 1 | CURRENTLY_BUILDING_COMPONENTS = "demos" |
|
2 | 2 | !include( ../config.pri ) { |
|
3 | 3 | error( "Couldn't find the config.pri file!" ) |
|
4 | 4 | } |
|
5 | 5 | |
|
6 | 6 | TEMPLATE = subdirs |
|
7 | 7 | SUBDIRS += piechartcustomization \ |
|
8 | 8 | dynamicspline \ |
|
9 | 9 | nesteddonuts \ |
|
10 | 10 | qmlchart \ |
|
11 | 11 | qmlweather \ |
|
12 | 12 | qmlf1legends \ |
|
13 | 13 | qmlcustomizations \ |
|
14 | 14 | qmlcustommodel \ |
|
15 | 15 | chartinteractions \ |
|
16 | 16 | qmlaxes \ |
|
17 | 17 | qmlcustomlegend \ |
|
18 | 18 | callout |
|
19 | 19 | |
|
20 | 20 | contains(QT_CONFIG, opengl) { |
|
21 | 21 | SUBDIRS += chartthemes \ |
|
22 |
qmloscilloscope |
|
|
23 | chartviewer | |
|
22 | qmloscilloscope | |
|
24 | 23 | } else { |
|
25 | 24 | message("OpenGL not available. Some demos are disabled") |
|
26 | 25 | } |
|
27 | 26 | |
|
28 | 27 | contains(QT_CONFIG, multimedia) { |
|
29 | 28 | SUBDIRS += audio |
|
30 | 29 | } else { |
|
31 | 30 | message("QtMultimedia library not available. Some demos are disabled") |
|
32 | 31 | } |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts.h to tests/chartviewer/charts.h |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisx.cpp to tests/chartviewer/charts/axis/barcategoryaxisx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisxlogy.cpp to tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisy.cpp to tests/chartviewer/charts/axis/barcategoryaxisy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/barcategoryaxisylogx.cpp to tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/categoryaxis.cpp to tests/chartviewer/charts/axis/categoryaxis.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/datetimeaxisx.cpp to tests/chartviewer/charts/axis/datetimeaxisx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/datetimeaxisy.cpp to tests/chartviewer/charts/axis/datetimeaxisy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/logvalueaxisx.cpp to tests/chartviewer/charts/axis/logvalueaxisx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/logvalueaxisy.cpp to tests/chartviewer/charts/axis/logvalueaxisy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/axis/valueaxis.cpp to tests/chartviewer/charts/axis/valueaxis.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalbarchart.cpp to tests/chartviewer/charts/barseries/horizontalbarchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp to tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp to tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalbarchart.cpp to tests/chartviewer/charts/barseries/verticalbarchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp to tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp to tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/charts.pri to tests/chartviewer/charts/charts.pri |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/barlogx.cpp to tests/chartviewer/charts/domain/barlogx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/barlogy.cpp to tests/chartviewer/charts/domain/barlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/barpercentlogx.cpp to tests/chartviewer/charts/domain/barpercentlogx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/barpercentlogy.cpp to tests/chartviewer/charts/domain/barpercentlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/barstackedlogx.cpp to tests/chartviewer/charts/domain/barstackedlogx.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/barstackedlogy.cpp to tests/chartviewer/charts/domain/barstackedlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/linelogxlogy.cpp to tests/chartviewer/charts/domain/linelogxlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/linelogxy.cpp to tests/chartviewer/charts/domain/linelogxy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/linexlogy.cpp to tests/chartviewer/charts/domain/linexlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterlogxlogy.cpp to tests/chartviewer/charts/domain/scatterlogxlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterlogxy.cpp to tests/chartviewer/charts/domain/scatterlogxy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/scatterxlogy.cpp to tests/chartviewer/charts/domain/scatterxlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinelogxlogy.cpp to tests/chartviewer/charts/domain/splinelogxlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinelogxy.cpp to tests/chartviewer/charts/domain/splinelogxy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/domain/splinexlogy.cpp to tests/chartviewer/charts/domain/splinexlogy.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/font/font.cpp to tests/chartviewer/charts/font/font.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp to tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp to tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/pieseries/donutchart.cpp to tests/chartviewer/charts/pieseries/donutchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/pieseries/piechart.cpp to tests/chartviewer/charts/pieseries/piechart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/size/sizecharts.cpp to tests/chartviewer/charts/size/sizecharts.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/areachart.cpp to tests/chartviewer/charts/xyseries/areachart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/linechart.cpp to tests/chartviewer/charts/xyseries/linechart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/scatterchart.cpp to tests/chartviewer/charts/xyseries/scatterchart.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/charts/xyseries/splinechart.cpp to tests/chartviewer/charts/xyseries/splinechart.cpp |
@@ -1,8 +1,8 | |||
|
1 |
!include( ../ |
|
|
1 | !include( ../tests.pri ):error( "Couldn't find the demos.pri file!" ) | |
|
2 | 2 | include(charts/charts.pri) |
|
3 | 3 | TARGET = chartviewer |
|
4 | 4 | QT += opengl |
|
5 | 5 | INCLUDEPATH += . |
|
6 | 6 | SOURCES += main.cpp window.cpp view.cpp grid.cpp |
|
7 | 7 | HEADERS += window.h view.h charts.h model.h grid.h |
|
8 | 8 |
|
1 | NO CONTENT: file renamed from demos/chartviewer/grid.cpp to tests/chartviewer/grid.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/grid.h to tests/chartviewer/grid.h |
|
1 | NO CONTENT: file renamed from demos/chartviewer/main.cpp to tests/chartviewer/main.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/model.h to tests/chartviewer/model.h |
|
1 | NO CONTENT: file renamed from demos/chartviewer/view.cpp to tests/chartviewer/view.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/view.h to tests/chartviewer/view.h |
|
1 | NO CONTENT: file renamed from demos/chartviewer/window.cpp to tests/chartviewer/window.cpp |
|
1 | NO CONTENT: file renamed from demos/chartviewer/window.h to tests/chartviewer/window.h |
@@ -1,17 +1,18 | |||
|
1 | 1 | !include( ../config.pri ) { |
|
2 | 2 | error( "Couldn't find the config.pri file!" ) |
|
3 | 3 | } |
|
4 | 4 | |
|
5 | 5 | TEMPLATE = subdirs |
|
6 | 6 | SUBDIRS += \ |
|
7 | 7 | auto \ |
|
8 | 8 | qmlchartproperties \ |
|
9 | 9 | qmlchartaxis \ |
|
10 | 10 | presenterchart |
|
11 | 11 | |
|
12 | 12 | contains(QT_CONFIG, opengl) { |
|
13 | 13 | SUBDIRS += chartwidgettest \ |
|
14 | wavechart | |
|
14 | wavechart \ | |
|
15 | chartviewer | |
|
15 | 16 | } else { |
|
16 | 17 | message("OpenGL not available. Some test apps are disabled") |
|
17 | 18 | } |
General Comments 0
You need to be logged in to leave comments.
Login now