diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-12 03:00:43 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-12 03:00:43 +0200 |
| commit | 1c0b503885cca9e8eccb6f36c2c1771d01a09eb0 (patch) | |
| tree | b1e8028d2948a7bf9516a66693606684cc27bc6b | |
| parent | 08de2bbd637de1ddfc5806d2dafabc56f0764661 (diff) | |
| parent | 8f0491327a24172b55b80adf491c983d141ec777 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I06c078868b98c6210bac5ad450122a191eeedef5
| -rw-r--r-- | examples/datavisualization/itemmodel/main.cpp | 6 | ||||
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization-index.qdoc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/datavisualization/itemmodel/main.cpp b/examples/datavisualization/itemmodel/main.cpp index 782d9dd2..3fca06b3 100644 --- a/examples/datavisualization/itemmodel/main.cpp +++ b/examples/datavisualization/itemmodel/main.cpp @@ -70,9 +70,6 @@ public: private: Q3DBars *m_graph; QTimer *m_dataTimer; - QTimer *m_styleTimer; - QTimer *m_presetTimer; - QTimer *m_themeTimer; int m_columnCount; int m_rowCount; QTableWidget *m_tableWidget; // not owned @@ -81,9 +78,6 @@ private: GraphDataGenerator::GraphDataGenerator(Q3DBars *bargraph, QTableWidget *tableWidget) : m_graph(bargraph), m_dataTimer(0), - m_styleTimer(0), - m_presetTimer(0), - m_themeTimer(0), m_columnCount(100), m_rowCount(50), m_tableWidget(tableWidget) diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc index fc09b08e..26184767 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc @@ -61,6 +61,12 @@ \snippet doc_src_qtdatavisualization.pro 0 + \section1 Licenses + + Qt Data Visualization is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the \l{GNU General Public License, version 3}. + See \l{Qt Licensing} for further details. + \section1 Articles \list \li \l{Qt Data Visualization Overview}{Overview} |