From 1e18d6a3f6b0e81e76009654a5eb9285cfcce598 2012-12-14 11:35:55 From: Marek Rosa Date: 2012-12-14 11:35:55 Subject: [PATCH] ChartViewer moved to tests --- diff --git a/demos/demos.pro b/demos/demos.pro index eb09747..43f6c93 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -19,8 +19,7 @@ SUBDIRS += piechartcustomization \ contains(QT_CONFIG, opengl) { SUBDIRS += chartthemes \ - qmloscilloscope \ - chartviewer + qmloscilloscope } else { message("OpenGL not available. Some demos are disabled") } diff --git a/demos/chartviewer/charts.h b/tests/chartviewer/charts.h similarity index 100% rename from demos/chartviewer/charts.h rename to tests/chartviewer/charts.h diff --git a/demos/chartviewer/charts/axis/barcategoryaxisx.cpp b/tests/chartviewer/charts/axis/barcategoryaxisx.cpp similarity index 100% rename from demos/chartviewer/charts/axis/barcategoryaxisx.cpp rename to tests/chartviewer/charts/axis/barcategoryaxisx.cpp diff --git a/demos/chartviewer/charts/axis/barcategoryaxisxlogy.cpp b/tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp similarity index 100% rename from demos/chartviewer/charts/axis/barcategoryaxisxlogy.cpp rename to tests/chartviewer/charts/axis/barcategoryaxisxlogy.cpp diff --git a/demos/chartviewer/charts/axis/barcategoryaxisy.cpp b/tests/chartviewer/charts/axis/barcategoryaxisy.cpp similarity index 100% rename from demos/chartviewer/charts/axis/barcategoryaxisy.cpp rename to tests/chartviewer/charts/axis/barcategoryaxisy.cpp diff --git a/demos/chartviewer/charts/axis/barcategoryaxisylogx.cpp b/tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp similarity index 100% rename from demos/chartviewer/charts/axis/barcategoryaxisylogx.cpp rename to tests/chartviewer/charts/axis/barcategoryaxisylogx.cpp diff --git a/demos/chartviewer/charts/axis/categoryaxis.cpp b/tests/chartviewer/charts/axis/categoryaxis.cpp similarity index 100% rename from demos/chartviewer/charts/axis/categoryaxis.cpp rename to tests/chartviewer/charts/axis/categoryaxis.cpp diff --git a/demos/chartviewer/charts/axis/datetimeaxisx.cpp b/tests/chartviewer/charts/axis/datetimeaxisx.cpp similarity index 100% rename from demos/chartviewer/charts/axis/datetimeaxisx.cpp rename to tests/chartviewer/charts/axis/datetimeaxisx.cpp diff --git a/demos/chartviewer/charts/axis/datetimeaxisy.cpp b/tests/chartviewer/charts/axis/datetimeaxisy.cpp similarity index 100% rename from demos/chartviewer/charts/axis/datetimeaxisy.cpp rename to tests/chartviewer/charts/axis/datetimeaxisy.cpp diff --git a/demos/chartviewer/charts/axis/logvalueaxisx.cpp b/tests/chartviewer/charts/axis/logvalueaxisx.cpp similarity index 100% rename from demos/chartviewer/charts/axis/logvalueaxisx.cpp rename to tests/chartviewer/charts/axis/logvalueaxisx.cpp diff --git a/demos/chartviewer/charts/axis/logvalueaxisy.cpp b/tests/chartviewer/charts/axis/logvalueaxisy.cpp similarity index 100% rename from demos/chartviewer/charts/axis/logvalueaxisy.cpp rename to tests/chartviewer/charts/axis/logvalueaxisy.cpp diff --git a/demos/chartviewer/charts/axis/valueaxis.cpp b/tests/chartviewer/charts/axis/valueaxis.cpp similarity index 100% rename from demos/chartviewer/charts/axis/valueaxis.cpp rename to tests/chartviewer/charts/axis/valueaxis.cpp diff --git a/demos/chartviewer/charts/barseries/horizontalbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalbarchart.cpp similarity index 100% rename from demos/chartviewer/charts/barseries/horizontalbarchart.cpp rename to tests/chartviewer/charts/barseries/horizontalbarchart.cpp diff --git a/demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp similarity index 100% rename from demos/chartviewer/charts/barseries/horizontalpercentbarchart.cpp rename to tests/chartviewer/charts/barseries/horizontalpercentbarchart.cpp diff --git a/demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp b/tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp similarity index 100% rename from demos/chartviewer/charts/barseries/horizontalstackedbarchart.cpp rename to tests/chartviewer/charts/barseries/horizontalstackedbarchart.cpp diff --git a/demos/chartviewer/charts/barseries/verticalbarchart.cpp b/tests/chartviewer/charts/barseries/verticalbarchart.cpp similarity index 100% rename from demos/chartviewer/charts/barseries/verticalbarchart.cpp rename to tests/chartviewer/charts/barseries/verticalbarchart.cpp diff --git a/demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp b/tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp similarity index 100% rename from demos/chartviewer/charts/barseries/verticalpercentbarchart.cpp rename to tests/chartviewer/charts/barseries/verticalpercentbarchart.cpp diff --git a/demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp b/tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp similarity index 100% rename from demos/chartviewer/charts/barseries/verticalstackedbarchart.cpp rename to tests/chartviewer/charts/barseries/verticalstackedbarchart.cpp diff --git a/demos/chartviewer/charts/charts.pri b/tests/chartviewer/charts/charts.pri similarity index 100% rename from demos/chartviewer/charts/charts.pri rename to tests/chartviewer/charts/charts.pri diff --git a/demos/chartviewer/charts/domain/barlogx.cpp b/tests/chartviewer/charts/domain/barlogx.cpp similarity index 100% rename from demos/chartviewer/charts/domain/barlogx.cpp rename to tests/chartviewer/charts/domain/barlogx.cpp diff --git a/demos/chartviewer/charts/domain/barlogy.cpp b/tests/chartviewer/charts/domain/barlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/barlogy.cpp rename to tests/chartviewer/charts/domain/barlogy.cpp diff --git a/demos/chartviewer/charts/domain/barpercentlogx.cpp b/tests/chartviewer/charts/domain/barpercentlogx.cpp similarity index 100% rename from demos/chartviewer/charts/domain/barpercentlogx.cpp rename to tests/chartviewer/charts/domain/barpercentlogx.cpp diff --git a/demos/chartviewer/charts/domain/barpercentlogy.cpp b/tests/chartviewer/charts/domain/barpercentlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/barpercentlogy.cpp rename to tests/chartviewer/charts/domain/barpercentlogy.cpp diff --git a/demos/chartviewer/charts/domain/barstackedlogx.cpp b/tests/chartviewer/charts/domain/barstackedlogx.cpp similarity index 100% rename from demos/chartviewer/charts/domain/barstackedlogx.cpp rename to tests/chartviewer/charts/domain/barstackedlogx.cpp diff --git a/demos/chartviewer/charts/domain/barstackedlogy.cpp b/tests/chartviewer/charts/domain/barstackedlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/barstackedlogy.cpp rename to tests/chartviewer/charts/domain/barstackedlogy.cpp diff --git a/demos/chartviewer/charts/domain/linelogxlogy.cpp b/tests/chartviewer/charts/domain/linelogxlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/linelogxlogy.cpp rename to tests/chartviewer/charts/domain/linelogxlogy.cpp diff --git a/demos/chartviewer/charts/domain/linelogxy.cpp b/tests/chartviewer/charts/domain/linelogxy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/linelogxy.cpp rename to tests/chartviewer/charts/domain/linelogxy.cpp diff --git a/demos/chartviewer/charts/domain/linexlogy.cpp b/tests/chartviewer/charts/domain/linexlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/linexlogy.cpp rename to tests/chartviewer/charts/domain/linexlogy.cpp diff --git a/demos/chartviewer/charts/domain/scatterlogxlogy.cpp b/tests/chartviewer/charts/domain/scatterlogxlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/scatterlogxlogy.cpp rename to tests/chartviewer/charts/domain/scatterlogxlogy.cpp diff --git a/demos/chartviewer/charts/domain/scatterlogxy.cpp b/tests/chartviewer/charts/domain/scatterlogxy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/scatterlogxy.cpp rename to tests/chartviewer/charts/domain/scatterlogxy.cpp diff --git a/demos/chartviewer/charts/domain/scatterxlogy.cpp b/tests/chartviewer/charts/domain/scatterxlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/scatterxlogy.cpp rename to tests/chartviewer/charts/domain/scatterxlogy.cpp diff --git a/demos/chartviewer/charts/domain/splinelogxlogy.cpp b/tests/chartviewer/charts/domain/splinelogxlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/splinelogxlogy.cpp rename to tests/chartviewer/charts/domain/splinelogxlogy.cpp diff --git a/demos/chartviewer/charts/domain/splinelogxy.cpp b/tests/chartviewer/charts/domain/splinelogxy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/splinelogxy.cpp rename to tests/chartviewer/charts/domain/splinelogxy.cpp diff --git a/demos/chartviewer/charts/domain/splinexlogy.cpp b/tests/chartviewer/charts/domain/splinexlogy.cpp similarity index 100% rename from demos/chartviewer/charts/domain/splinexlogy.cpp rename to tests/chartviewer/charts/domain/splinexlogy.cpp diff --git a/demos/chartviewer/charts/font/font.cpp b/tests/chartviewer/charts/font/font.cpp similarity index 100% rename from demos/chartviewer/charts/font/font.cpp rename to tests/chartviewer/charts/font/font.cpp diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis.cpp similarity index 100% rename from demos/chartviewer/charts/multiaxis/multivalueaxis.cpp rename to tests/chartviewer/charts/multiaxis/multivalueaxis.cpp diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp similarity index 100% rename from demos/chartviewer/charts/multiaxis/multivalueaxis2.cpp rename to tests/chartviewer/charts/multiaxis/multivalueaxis2.cpp diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp similarity index 100% rename from demos/chartviewer/charts/multiaxis/multivalueaxis3.cpp rename to tests/chartviewer/charts/multiaxis/multivalueaxis3.cpp diff --git a/demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp b/tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp similarity index 100% rename from demos/chartviewer/charts/multiaxis/multivalueaxis4.cpp rename to tests/chartviewer/charts/multiaxis/multivalueaxis4.cpp diff --git a/demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp b/tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp similarity index 100% rename from demos/chartviewer/charts/multiaxis/multivaluebaraxis.cpp rename to tests/chartviewer/charts/multiaxis/multivaluebaraxis.cpp diff --git a/demos/chartviewer/charts/pieseries/donutchart.cpp b/tests/chartviewer/charts/pieseries/donutchart.cpp similarity index 100% rename from demos/chartviewer/charts/pieseries/donutchart.cpp rename to tests/chartviewer/charts/pieseries/donutchart.cpp diff --git a/demos/chartviewer/charts/pieseries/piechart.cpp b/tests/chartviewer/charts/pieseries/piechart.cpp similarity index 100% rename from demos/chartviewer/charts/pieseries/piechart.cpp rename to tests/chartviewer/charts/pieseries/piechart.cpp diff --git a/demos/chartviewer/charts/size/sizecharts.cpp b/tests/chartviewer/charts/size/sizecharts.cpp similarity index 100% rename from demos/chartviewer/charts/size/sizecharts.cpp rename to tests/chartviewer/charts/size/sizecharts.cpp diff --git a/demos/chartviewer/charts/xyseries/areachart.cpp b/tests/chartviewer/charts/xyseries/areachart.cpp similarity index 100% rename from demos/chartviewer/charts/xyseries/areachart.cpp rename to tests/chartviewer/charts/xyseries/areachart.cpp diff --git a/demos/chartviewer/charts/xyseries/linechart.cpp b/tests/chartviewer/charts/xyseries/linechart.cpp similarity index 100% rename from demos/chartviewer/charts/xyseries/linechart.cpp rename to tests/chartviewer/charts/xyseries/linechart.cpp diff --git a/demos/chartviewer/charts/xyseries/scatterchart.cpp b/tests/chartviewer/charts/xyseries/scatterchart.cpp similarity index 100% rename from demos/chartviewer/charts/xyseries/scatterchart.cpp rename to tests/chartviewer/charts/xyseries/scatterchart.cpp diff --git a/demos/chartviewer/charts/xyseries/splinechart.cpp b/tests/chartviewer/charts/xyseries/splinechart.cpp similarity index 100% rename from demos/chartviewer/charts/xyseries/splinechart.cpp rename to tests/chartviewer/charts/xyseries/splinechart.cpp diff --git a/demos/chartviewer/chartviewer.pro b/tests/chartviewer/chartviewer.pro similarity index 85% rename from demos/chartviewer/chartviewer.pro rename to tests/chartviewer/chartviewer.pro index a816e4d..3ab604c 100644 --- a/demos/chartviewer/chartviewer.pro +++ b/tests/chartviewer/chartviewer.pro @@ -1,4 +1,4 @@ -!include( ../demos.pri ):error( "Couldn't find the demos.pri file!" ) +!include( ../tests.pri ):error( "Couldn't find the demos.pri file!" ) include(charts/charts.pri) TARGET = chartviewer QT += opengl diff --git a/demos/chartviewer/grid.cpp b/tests/chartviewer/grid.cpp similarity index 100% rename from demos/chartviewer/grid.cpp rename to tests/chartviewer/grid.cpp diff --git a/demos/chartviewer/grid.h b/tests/chartviewer/grid.h similarity index 100% rename from demos/chartviewer/grid.h rename to tests/chartviewer/grid.h diff --git a/demos/chartviewer/main.cpp b/tests/chartviewer/main.cpp similarity index 100% rename from demos/chartviewer/main.cpp rename to tests/chartviewer/main.cpp diff --git a/demos/chartviewer/model.h b/tests/chartviewer/model.h similarity index 100% rename from demos/chartviewer/model.h rename to tests/chartviewer/model.h diff --git a/demos/chartviewer/view.cpp b/tests/chartviewer/view.cpp similarity index 100% rename from demos/chartviewer/view.cpp rename to tests/chartviewer/view.cpp diff --git a/demos/chartviewer/view.h b/tests/chartviewer/view.h similarity index 100% rename from demos/chartviewer/view.h rename to tests/chartviewer/view.h diff --git a/demos/chartviewer/window.cpp b/tests/chartviewer/window.cpp similarity index 100% rename from demos/chartviewer/window.cpp rename to tests/chartviewer/window.cpp diff --git a/demos/chartviewer/window.h b/tests/chartviewer/window.h similarity index 100% rename from demos/chartviewer/window.h rename to tests/chartviewer/window.h diff --git a/tests/tests.pro b/tests/tests.pro index 38dd75d..068ad6f 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -11,7 +11,8 @@ SUBDIRS += \ contains(QT_CONFIG, opengl) { SUBDIRS += chartwidgettest \ - wavechart + wavechart \ + chartviewer } else { message("OpenGL not available. Some test apps are disabled") }