diff --git a/charts.pro b/charts.pro index 0d86d66..e19590a 100644 --- a/charts.pro +++ b/charts.pro @@ -3,7 +3,7 @@ } TEMPLATE = subdirs -SUBDIRS += src example test qmlplugin +SUBDIRS += src examples test qmlplugin integrated_build:{ message('Configured for integrated build') diff --git a/example/splinechart/splinechart.pro b/example/splinechart/splinechart.pro deleted file mode 100644 index 5c800ad..0000000 --- a/example/splinechart/splinechart.pro +++ /dev/null @@ -1,20 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-02-29T12:37:46 -# -#------------------------------------------------- - -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) -} - -QT += core gui - -TARGET = splinechart -TEMPLATE = app - - -SOURCES += main.cpp\ - splinewidget.cpp - -HEADERS += splinewidget.h diff --git a/example/areachart/areachart.pro b/examples/areachart/areachart.pro similarity index 60% rename from example/areachart/areachart.pro rename to examples/areachart/areachart.pro index f9b33f6..13d1019 100644 --- a/example/areachart/areachart.pro +++ b/examples/areachart/areachart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = areachart SOURCES += main.cpp diff --git a/example/areachart/main.cpp b/examples/areachart/main.cpp similarity index 100% rename from example/areachart/main.cpp rename to examples/areachart/main.cpp diff --git a/example/axischart/axischart.pro b/examples/axischart/axischart.pro similarity index 60% rename from example/axischart/axischart.pro rename to examples/axischart/axischart.pro index d88e462..b13f301 100644 --- a/example/axischart/axischart.pro +++ b/examples/axischart/axischart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = axischart SOURCES = main.cpp diff --git a/example/axischart/main.cpp b/examples/axischart/main.cpp similarity index 100% rename from example/axischart/main.cpp rename to examples/axischart/main.cpp diff --git a/example/barchart/barchart.pro b/examples/barchart/barchart.pro similarity index 75% rename from example/barchart/barchart.pro rename to examples/barchart/barchart.pro index 009c8c7..f9e3a14 100644 --- a/example/barchart/barchart.pro +++ b/examples/barchart/barchart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = barchart diff --git a/example/barchart/chartwidget.cpp b/examples/barchart/chartwidget.cpp similarity index 100% rename from example/barchart/chartwidget.cpp rename to examples/barchart/chartwidget.cpp diff --git a/example/barchart/chartwidget.h b/examples/barchart/chartwidget.h similarity index 100% rename from example/barchart/chartwidget.h rename to examples/barchart/chartwidget.h diff --git a/example/barchart/main.cpp b/examples/barchart/main.cpp similarity index 100% rename from example/barchart/main.cpp rename to examples/barchart/main.cpp diff --git a/example/chartview/chartview.pro b/examples/chartview/chartview.pro similarity index 50% rename from example/chartview/chartview.pro rename to examples/chartview/chartview.pro index feca05f..029b661 100644 --- a/example/chartview/chartview.pro +++ b/examples/chartview/chartview.pro @@ -1,9 +1,6 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } -QT += core gui TARGET = chartview -TEMPLATE = app - SOURCES += main.cpp diff --git a/example/chartview/main.cpp b/examples/chartview/main.cpp similarity index 100% rename from example/chartview/main.cpp rename to examples/chartview/main.cpp diff --git a/example/colorlinechart/colorlinechart.pro b/examples/colorlinechart/colorlinechart.pro similarity index 60% rename from example/colorlinechart/colorlinechart.pro rename to examples/colorlinechart/colorlinechart.pro index e7c20ec..18415c8 100644 --- a/example/colorlinechart/colorlinechart.pro +++ b/examples/colorlinechart/colorlinechart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = colorlinechart diff --git a/example/colorlinechart/main.cpp b/examples/colorlinechart/main.cpp similarity index 100% rename from example/colorlinechart/main.cpp rename to examples/colorlinechart/main.cpp diff --git a/example/dynamiclinechart/dynamiclinechart.pro b/examples/dynamiclinechart/dynamiclinechart.pro similarity index 71% rename from example/dynamiclinechart/dynamiclinechart.pro rename to examples/dynamiclinechart/dynamiclinechart.pro index 90f5aae..0e25690 100644 --- a/example/dynamiclinechart/dynamiclinechart.pro +++ b/examples/dynamiclinechart/dynamiclinechart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } QT+=opengl TARGET = dynamiclinechart diff --git a/example/dynamiclinechart/main.cpp b/examples/dynamiclinechart/main.cpp similarity index 100% rename from example/dynamiclinechart/main.cpp rename to examples/dynamiclinechart/main.cpp diff --git a/example/dynamiclinechart/wavegenerator.h b/examples/dynamiclinechart/wavegenerator.h similarity index 100% rename from example/dynamiclinechart/wavegenerator.h rename to examples/dynamiclinechart/wavegenerator.h diff --git a/example/example.pri b/examples/examples.pri similarity index 100% rename from example/example.pri rename to examples/examples.pri diff --git a/example/example.pro b/examples/examples.pro similarity index 100% rename from example/example.pro rename to examples/examples.pro diff --git a/example/gdpbarchart/gdpData b/examples/gdpbarchart/gdpData similarity index 100% rename from example/gdpbarchart/gdpData rename to examples/gdpbarchart/gdpData Binary files a/example/gdpbarchart/gdpData and b/examples/gdpbarchart/gdpData differ diff --git a/example/gdpbarchart/gdpbarchart.pro b/examples/gdpbarchart/gdpbarchart.pro similarity index 77% rename from example/gdpbarchart/gdpbarchart.pro rename to examples/gdpbarchart/gdpbarchart.pro index 06f0f3c..3623d4f 100644 --- a/example/gdpbarchart/gdpbarchart.pro +++ b/examples/gdpbarchart/gdpbarchart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } QT+= sql diff --git a/example/gdpbarchart/main.cpp b/examples/gdpbarchart/main.cpp similarity index 100% rename from example/gdpbarchart/main.cpp rename to examples/gdpbarchart/main.cpp diff --git a/example/gdpbarchart/widget.cpp b/examples/gdpbarchart/widget.cpp similarity index 100% rename from example/gdpbarchart/widget.cpp rename to examples/gdpbarchart/widget.cpp diff --git a/example/gdpbarchart/widget.h b/examples/gdpbarchart/widget.h similarity index 100% rename from example/gdpbarchart/widget.h rename to examples/gdpbarchart/widget.h diff --git a/example/linechart/linechart.pro b/examples/linechart/linechart.pro similarity index 60% rename from example/linechart/linechart.pro rename to examples/linechart/linechart.pro index 489e6ad..1247245 100644 --- a/example/linechart/linechart.pro +++ b/examples/linechart/linechart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = linechart SOURCES += main.cpp diff --git a/example/linechart/main.cpp b/examples/linechart/main.cpp similarity index 100% rename from example/linechart/main.cpp rename to examples/linechart/main.cpp diff --git a/example/multichart/main.cpp b/examples/multichart/main.cpp similarity index 100% rename from example/multichart/main.cpp rename to examples/multichart/main.cpp diff --git a/example/multichart/multichart.pro b/examples/multichart/multichart.pro similarity index 75% rename from example/multichart/multichart.pro rename to examples/multichart/multichart.pro index 5a351e9..951f237 100644 --- a/example/multichart/multichart.pro +++ b/examples/multichart/multichart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = multichart SOURCES += main.cpp \ diff --git a/example/multichart/multichartwidget.cpp b/examples/multichart/multichartwidget.cpp similarity index 100% rename from example/multichart/multichartwidget.cpp rename to examples/multichart/multichartwidget.cpp diff --git a/example/multichart/multichartwidget.h b/examples/multichart/multichartwidget.h similarity index 100% rename from example/multichart/multichartwidget.h rename to examples/multichart/multichartwidget.h diff --git a/example/percentbarchart/chartwidget.cpp b/examples/percentbarchart/chartwidget.cpp similarity index 100% rename from example/percentbarchart/chartwidget.cpp rename to examples/percentbarchart/chartwidget.cpp diff --git a/example/percentbarchart/chartwidget.h b/examples/percentbarchart/chartwidget.h similarity index 100% rename from example/percentbarchart/chartwidget.h rename to examples/percentbarchart/chartwidget.h diff --git a/example/percentbarchart/main.cpp b/examples/percentbarchart/main.cpp similarity index 100% rename from example/percentbarchart/main.cpp rename to examples/percentbarchart/main.cpp diff --git a/example/percentbarchart/percentbarchart.pro b/examples/percentbarchart/percentbarchart.pro similarity index 75% rename from example/percentbarchart/percentbarchart.pro rename to examples/percentbarchart/percentbarchart.pro index 4f19441..3b0e6fc 100644 --- a/example/percentbarchart/percentbarchart.pro +++ b/examples/percentbarchart/percentbarchart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = percentbarchart diff --git a/example/piechart/main.cpp b/examples/piechart/main.cpp similarity index 100% rename from example/piechart/main.cpp rename to examples/piechart/main.cpp diff --git a/example/piechart/piechart.pro b/examples/piechart/piechart.pro similarity index 54% rename from example/piechart/piechart.pro rename to examples/piechart/piechart.pro index a8bed67..71f6093 100644 --- a/example/piechart/piechart.pro +++ b/examples/piechart/piechart.pro @@ -1,8 +1,7 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = piechart SOURCES += main.cpp -HEADERS += diff --git a/example/piechartcustomization/main.cpp b/examples/piechartcustomization/main.cpp similarity index 100% rename from example/piechartcustomization/main.cpp rename to examples/piechartcustomization/main.cpp diff --git a/example/piechartcustomization/piechartcustomization.pro b/examples/piechartcustomization/piechartcustomization.pro similarity index 54% rename from example/piechartcustomization/piechartcustomization.pro rename to examples/piechartcustomization/piechartcustomization.pro index 1230dad..55eecaa 100644 --- a/example/piechartcustomization/piechartcustomization.pro +++ b/examples/piechartcustomization/piechartcustomization.pro @@ -1,8 +1,7 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = piechartcustomization SOURCES += main.cpp -HEADERS += diff --git a/example/piechartdrilldown/main.cpp b/examples/piechartdrilldown/main.cpp similarity index 100% rename from example/piechartdrilldown/main.cpp rename to examples/piechartdrilldown/main.cpp diff --git a/example/piechartdrilldown/piechartdrilldown.pro b/examples/piechartdrilldown/piechartdrilldown.pro similarity index 50% rename from example/piechartdrilldown/piechartdrilldown.pro rename to examples/piechartdrilldown/piechartdrilldown.pro index df16e45..69cf949 100644 --- a/example/piechartdrilldown/piechartdrilldown.pro +++ b/examples/piechartdrilldown/piechartdrilldown.pro @@ -1,9 +1,6 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = piechartdrilldown SOURCES += main.cpp -HEADERS += - -MOC_DIR = $$PWD/moc diff --git a/example/presenterchart/chartview.cpp b/examples/presenterchart/chartview.cpp similarity index 100% rename from example/presenterchart/chartview.cpp rename to examples/presenterchart/chartview.cpp diff --git a/example/presenterchart/chartview.h b/examples/presenterchart/chartview.h similarity index 100% rename from example/presenterchart/chartview.h rename to examples/presenterchart/chartview.h diff --git a/example/presenterchart/main.cpp b/examples/presenterchart/main.cpp similarity index 100% rename from example/presenterchart/main.cpp rename to examples/presenterchart/main.cpp diff --git a/example/presenterchart/presenterchart.pro b/examples/presenterchart/presenterchart.pro similarity index 66% rename from example/presenterchart/presenterchart.pro rename to examples/presenterchart/presenterchart.pro index fe66c78..1f57047 100644 --- a/example/presenterchart/presenterchart.pro +++ b/examples/presenterchart/presenterchart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = presenterchart HEADERS += chartview.h diff --git a/example/scatterchart/main.cpp b/examples/scatterchart/main.cpp similarity index 100% rename from example/scatterchart/main.cpp rename to examples/scatterchart/main.cpp diff --git a/example/scatterchart/scatterchart.pro b/examples/scatterchart/scatterchart.pro similarity index 60% rename from example/scatterchart/scatterchart.pro rename to examples/scatterchart/scatterchart.pro index 5d58701..332d20e 100644 --- a/example/scatterchart/scatterchart.pro +++ b/examples/scatterchart/scatterchart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = scatterchart SOURCES += main.cpp diff --git a/example/scatterinteractions/main.cpp b/examples/scatterinteractions/main.cpp similarity index 100% rename from example/scatterinteractions/main.cpp rename to examples/scatterinteractions/main.cpp diff --git a/example/scatterinteractions/mainwindow.cpp b/examples/scatterinteractions/mainwindow.cpp similarity index 100% rename from example/scatterinteractions/mainwindow.cpp rename to examples/scatterinteractions/mainwindow.cpp diff --git a/example/scatterinteractions/mainwindow.h b/examples/scatterinteractions/mainwindow.h similarity index 100% rename from example/scatterinteractions/mainwindow.h rename to examples/scatterinteractions/mainwindow.h diff --git a/example/scatterinteractions/scatterinteractions.pro b/examples/scatterinteractions/scatterinteractions.pro similarity index 62% rename from example/scatterinteractions/scatterinteractions.pro rename to examples/scatterinteractions/scatterinteractions.pro index 2514c4b..3c64d80 100644 --- a/example/scatterinteractions/scatterinteractions.pro +++ b/examples/scatterinteractions/scatterinteractions.pro @@ -1,12 +1,8 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } -QT += core gui TARGET = scatterinteractions -TEMPLATE = app - SOURCES += main.cpp\ mainwindow.cpp - HEADERS += mainwindow.h diff --git a/example/splinechart/main.cpp b/examples/splinechart/main.cpp similarity index 100% rename from example/splinechart/main.cpp rename to examples/splinechart/main.cpp diff --git a/examples/splinechart/splinechart.pro b/examples/splinechart/splinechart.pro new file mode 100644 index 0000000..22ecfb7 --- /dev/null +++ b/examples/splinechart/splinechart.pro @@ -0,0 +1,7 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} +TARGET = splinechart +SOURCES += main.cpp\ + splinewidget.cpp +HEADERS += splinewidget.h diff --git a/example/splinechart/splinewidget.cpp b/examples/splinechart/splinewidget.cpp similarity index 100% rename from example/splinechart/splinewidget.cpp rename to examples/splinechart/splinewidget.cpp diff --git a/example/splinechart/splinewidget.h b/examples/splinechart/splinewidget.h similarity index 100% rename from example/splinechart/splinewidget.h rename to examples/splinechart/splinewidget.h diff --git a/example/stackedbarchart/chartwidget.cpp b/examples/stackedbarchart/chartwidget.cpp similarity index 100% rename from example/stackedbarchart/chartwidget.cpp rename to examples/stackedbarchart/chartwidget.cpp diff --git a/example/stackedbarchart/chartwidget.h b/examples/stackedbarchart/chartwidget.h similarity index 100% rename from example/stackedbarchart/chartwidget.h rename to examples/stackedbarchart/chartwidget.h diff --git a/example/stackedbarchart/main.cpp b/examples/stackedbarchart/main.cpp similarity index 100% rename from example/stackedbarchart/main.cpp rename to examples/stackedbarchart/main.cpp diff --git a/example/stackedbarchart/stackedbarchart.pro b/examples/stackedbarchart/stackedbarchart.pro similarity index 75% rename from example/stackedbarchart/stackedbarchart.pro rename to examples/stackedbarchart/stackedbarchart.pro index 33296fa..5fee60a 100644 --- a/example/stackedbarchart/stackedbarchart.pro +++ b/examples/stackedbarchart/stackedbarchart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = stackedbarchart SOURCES += main.cpp \ diff --git a/example/stackedbarchartdrilldown/chartwidget.cpp b/examples/stackedbarchartdrilldown/chartwidget.cpp similarity index 100% rename from example/stackedbarchartdrilldown/chartwidget.cpp rename to examples/stackedbarchartdrilldown/chartwidget.cpp diff --git a/example/stackedbarchartdrilldown/chartwidget.h b/examples/stackedbarchartdrilldown/chartwidget.h similarity index 100% rename from example/stackedbarchartdrilldown/chartwidget.h rename to examples/stackedbarchartdrilldown/chartwidget.h diff --git a/example/stackedbarchartdrilldown/main.cpp b/examples/stackedbarchartdrilldown/main.cpp similarity index 100% rename from example/stackedbarchartdrilldown/main.cpp rename to examples/stackedbarchartdrilldown/main.cpp diff --git a/example/stackedbarchartdrilldown/stackedbarchartdrilldown.pro b/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro similarity index 75% rename from example/stackedbarchartdrilldown/stackedbarchartdrilldown.pro rename to examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro index 67e7475..a50a3af 100644 --- a/example/stackedbarchartdrilldown/stackedbarchartdrilldown.pro +++ b/examples/stackedbarchartdrilldown/stackedbarchartdrilldown.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = stackedbarchartdrilldown SOURCES += main.cpp \ diff --git a/example/zoomlinechart/chartwidget.cpp b/examples/zoomlinechart/chartwidget.cpp similarity index 100% rename from example/zoomlinechart/chartwidget.cpp rename to examples/zoomlinechart/chartwidget.cpp diff --git a/example/zoomlinechart/chartwidget.h b/examples/zoomlinechart/chartwidget.h similarity index 100% rename from example/zoomlinechart/chartwidget.h rename to examples/zoomlinechart/chartwidget.h diff --git a/example/zoomlinechart/main.cpp b/examples/zoomlinechart/main.cpp similarity index 100% rename from example/zoomlinechart/main.cpp rename to examples/zoomlinechart/main.cpp diff --git a/example/zoomlinechart/zoomlinechart.pro b/examples/zoomlinechart/zoomlinechart.pro similarity index 66% rename from example/zoomlinechart/zoomlinechart.pro rename to examples/zoomlinechart/zoomlinechart.pro index 6fe0790..8f1ef10 100644 --- a/example/zoomlinechart/zoomlinechart.pro +++ b/examples/zoomlinechart/zoomlinechart.pro @@ -1,5 +1,5 @@ -!include( ../example.pri ) { - error( "Couldn't find the example.pri file!" ) +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) } TARGET = zoomlinechart HEADERS += chartwidget.h