diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/manual/barstest/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/barstest/chart.cpp | 4 | ||||
-rw-r--r-- | tests/manual/barstest/custominputhandler.h | 4 | ||||
-rw-r--r-- | tests/manual/directional/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/itemmodeltest/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/minimalbars/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/manual/minimalscatter/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/manual/minimalsurface/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/manual/multigraphs/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/qmldynamicdata/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/qmlmultitest/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/qmlperf/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/qmlvolume/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/manual/scattertest/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/surfacetest/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/manual/volumetrictest/CMakeLists.txt | 1 |
16 files changed, 19 insertions, 7 deletions
diff --git a/tests/manual/barstest/CMakeLists.txt b/tests/manual/barstest/CMakeLists.txt index f3d695d5..50c156e5 100644 --- a/tests/manual/barstest/CMakeLists.txt +++ b/tests/manual/barstest/CMakeLists.txt @@ -7,6 +7,7 @@ qt_add_executable(barstest PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) set(barstest_resource_files diff --git a/tests/manual/barstest/chart.cpp b/tests/manual/barstest/chart.cpp index 93751d59..7d878046 100644 --- a/tests/manual/barstest/chart.cpp +++ b/tests/manual/barstest/chart.cpp @@ -684,7 +684,9 @@ void GraphModifier::changeSelectionMode() { static int selectionMode = m_graph->selectionMode(); - if (++selectionMode > (QAbstract3DGraph::SelectionItemAndColumn | QAbstract3DGraph::SelectionSlice | QAbstract3DGraph::SelectionMultiSeries)) + if (++selectionMode > (int)(QAbstract3DGraph::SelectionItemAndColumn | + QAbstract3DGraph::SelectionSlice | + QAbstract3DGraph::SelectionMultiSeries)) selectionMode = QAbstract3DGraph::SelectionNone; m_graph->setSelectionMode((QAbstract3DGraph::SelectionFlag)selectionMode); diff --git a/tests/manual/barstest/custominputhandler.h b/tests/manual/barstest/custominputhandler.h index ce864335..62b87d31 100644 --- a/tests/manual/barstest/custominputhandler.h +++ b/tests/manual/barstest/custominputhandler.h @@ -38,8 +38,8 @@ class CustomInputHandler : public QAbstract3DInputHandler public: explicit CustomInputHandler(QObject *parent = 0); - virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); - virtual void wheelEvent(QWheelEvent *event); + virtual void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) override; + virtual void wheelEvent(QWheelEvent *event) override; }; #endif diff --git a/tests/manual/directional/CMakeLists.txt b/tests/manual/directional/CMakeLists.txt index 4cb20b33..b67312d3 100644 --- a/tests/manual/directional/CMakeLists.txt +++ b/tests/manual/directional/CMakeLists.txt @@ -6,4 +6,5 @@ qt_add_executable(directional PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) diff --git a/tests/manual/itemmodeltest/CMakeLists.txt b/tests/manual/itemmodeltest/CMakeLists.txt index 070ffe60..4cc2676f 100644 --- a/tests/manual/itemmodeltest/CMakeLists.txt +++ b/tests/manual/itemmodeltest/CMakeLists.txt @@ -5,4 +5,5 @@ qt_add_executable(itemmodeltest PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) diff --git a/tests/manual/minimalbars/CMakeLists.txt b/tests/manual/minimalbars/CMakeLists.txt index 00a8732c..202435f2 100644 --- a/tests/manual/minimalbars/CMakeLists.txt +++ b/tests/manual/minimalbars/CMakeLists.txt @@ -4,5 +4,5 @@ qt_add_executable(MinimalBars ../../../src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp PUBLIC_LIBRARIES Qt::Gui - datavisualization + Qt::DataVisualization ) diff --git a/tests/manual/minimalscatter/CMakeLists.txt b/tests/manual/minimalscatter/CMakeLists.txt index 12337ac7..d54c2e9b 100644 --- a/tests/manual/minimalscatter/CMakeLists.txt +++ b/tests/manual/minimalscatter/CMakeLists.txt @@ -4,5 +4,5 @@ qt_add_executable(MinimalScatter ../../../src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp PUBLIC_LIBRARIES Qt::Gui - datavisualization + Qt::DataVisualization ) diff --git a/tests/manual/minimalsurface/CMakeLists.txt b/tests/manual/minimalsurface/CMakeLists.txt index acd972a5..4007c1fe 100644 --- a/tests/manual/minimalsurface/CMakeLists.txt +++ b/tests/manual/minimalsurface/CMakeLists.txt @@ -4,5 +4,5 @@ qt_add_executable(minimalSurface ../../../src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp PUBLIC_LIBRARIES Qt::Gui - datavisualization + Qt::DataVisualization ) diff --git a/tests/manual/multigraphs/CMakeLists.txt b/tests/manual/multigraphs/CMakeLists.txt index c328d97b..5eb6c7c7 100644 --- a/tests/manual/multigraphs/CMakeLists.txt +++ b/tests/manual/multigraphs/CMakeLists.txt @@ -6,6 +6,7 @@ qt_add_executable(multigraphs PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) set(multigraphs_resource_files diff --git a/tests/manual/qmldynamicdata/CMakeLists.txt b/tests/manual/qmldynamicdata/CMakeLists.txt index 6586e6ba..ee9e6124 100644 --- a/tests/manual/qmldynamicdata/CMakeLists.txt +++ b/tests/manual/qmldynamicdata/CMakeLists.txt @@ -4,6 +4,7 @@ qt_add_executable(qmldynamicdata main.cpp PUBLIC_LIBRARIES Qt::Gui + Qt::DataVisualization ) set(qmldynamicdata_resource_files diff --git a/tests/manual/qmlmultitest/CMakeLists.txt b/tests/manual/qmlmultitest/CMakeLists.txt index 2a24f78c..85dbe2a0 100644 --- a/tests/manual/qmlmultitest/CMakeLists.txt +++ b/tests/manual/qmlmultitest/CMakeLists.txt @@ -4,6 +4,7 @@ qt_add_executable(qmlmultitest main.cpp PUBLIC_LIBRARIES Qt::Gui + Qt::DataVisualization ) set(qmlmultitest_resource_files diff --git a/tests/manual/qmlperf/CMakeLists.txt b/tests/manual/qmlperf/CMakeLists.txt index 666f279f..34e9dbd0 100644 --- a/tests/manual/qmlperf/CMakeLists.txt +++ b/tests/manual/qmlperf/CMakeLists.txt @@ -5,6 +5,7 @@ qt_add_executable(qmlperf main.cpp PUBLIC_LIBRARIES Qt::Gui + Qt::DataVisualization ) set(qmlperf_resource_files diff --git a/tests/manual/qmlvolume/CMakeLists.txt b/tests/manual/qmlvolume/CMakeLists.txt index e18dc620..b7761dfc 100644 --- a/tests/manual/qmlvolume/CMakeLists.txt +++ b/tests/manual/qmlvolume/CMakeLists.txt @@ -5,7 +5,7 @@ qt_add_executable(qmlvolume main.cpp PUBLIC_LIBRARIES Qt::Gui - datavisualization + Qt::DataVisualization ) set(qmlvolume_resource_files diff --git a/tests/manual/scattertest/CMakeLists.txt b/tests/manual/scattertest/CMakeLists.txt index 614dd1d3..46f7b1de 100644 --- a/tests/manual/scattertest/CMakeLists.txt +++ b/tests/manual/scattertest/CMakeLists.txt @@ -6,4 +6,5 @@ qt_add_executable(scattertest PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) diff --git a/tests/manual/surfacetest/CMakeLists.txt b/tests/manual/surfacetest/CMakeLists.txt index 27539f88..4f73c200 100644 --- a/tests/manual/surfacetest/CMakeLists.txt +++ b/tests/manual/surfacetest/CMakeLists.txt @@ -6,6 +6,7 @@ qt_add_executable(surfacetest PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) set_source_files_properties("Heightmap.png" diff --git a/tests/manual/volumetrictest/CMakeLists.txt b/tests/manual/volumetrictest/CMakeLists.txt index d0fd8dde..21228f34 100644 --- a/tests/manual/volumetrictest/CMakeLists.txt +++ b/tests/manual/volumetrictest/CMakeLists.txt @@ -6,6 +6,7 @@ qt_add_executable(volumetrictest PUBLIC_LIBRARIES Qt::Gui Qt::Widgets + Qt::DataVisualization ) set_source_files_properties("cubeFilledFlat.obj" |