diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-10 08:34:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-06 15:14:33 +0200 |
| commit | 8a8b69bf140b21d8d5d865ac11d18273fb47da16 (patch) | |
| tree | 3614ff441bb5bcab7423adf9d84ed02055d03c60 /tests/manual | |
| parent | fe003ee4fcaae8ceb877112d63c22bda2e9f06fd (diff) | |
Update dependencies
qtbase: Adapt to OpenGL split (a64f4b405222527a72fb087226801c52ddf54ef0),
add missing Q_MOC_INCLUDE, adapt examples to changed signals.
Task-number: QTBUG-74273
Change-Id: I96b7bb67c0403e3aa72debe16fd9965c70f5c806
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/boxplottester/customtablemodel.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/boxplottester/customtablemodel.h | 4 | ||||
| -rw-r--r-- | tests/manual/chartviewer/window.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/chartwidgettest/mainwidget.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/wavechart/main.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/manual/boxplottester/customtablemodel.cpp b/tests/manual/boxplottester/customtablemodel.cpp index 4521c7a4..b111165d 100644 --- a/tests/manual/boxplottester/customtablemodel.cpp +++ b/tests/manual/boxplottester/customtablemodel.cpp @@ -152,5 +152,5 @@ Qt::ItemFlags CustomTableModel::flags(const QModelIndex &index) const void CustomTableModel::addMapping(QString color, QRect area) { - m_mapping.insertMulti(color, area); + m_mapping.insert(color, area); } diff --git a/tests/manual/boxplottester/customtablemodel.h b/tests/manual/boxplottester/customtablemodel.h index 1c938a0d..196ab204 100644 --- a/tests/manual/boxplottester/customtablemodel.h +++ b/tests/manual/boxplottester/customtablemodel.h @@ -31,7 +31,7 @@ #define CUSTOMTABLEMODEL_H #include <QtCore/QAbstractTableModel> -#include <QtCore/QHash> +#include <QtCore/QMultiHash> #include <QtCore/QRect> class CustomTableModel : public QAbstractTableModel @@ -53,7 +53,7 @@ public: private: QList<QVector<qreal> *> m_data; - QHash<QString, QRect> m_mapping; + QMultiHash<QString, QRect> m_mapping; int m_columnCount; int m_rowCount; }; diff --git a/tests/manual/chartviewer/window.cpp b/tests/manual/chartviewer/window.cpp index 85a6c956..d9214493 100644 --- a/tests/manual/chartviewer/window.cpp +++ b/tests/manual/chartviewer/window.cpp @@ -45,7 +45,7 @@ #include <QtWidgets/QGraphicsScene> #include <QtWidgets/QGraphicsLinearLayout> #include <QtWidgets/QGraphicsProxyWidget> -#include <QtWidgets/QOpenGLWidget> +#include <QtOpenGLWidgets/QOpenGLWidget> #include <QtWidgets/QApplication> #include <QtCore/QDebug> #include <QtCore/QRegularExpression> diff --git a/tests/manual/chartwidgettest/mainwidget.cpp b/tests/manual/chartwidgettest/mainwidget.cpp index ebb00f22..4216fc07 100644 --- a/tests/manual/chartwidgettest/mainwidget.cpp +++ b/tests/manual/chartwidgettest/mainwidget.cpp @@ -52,7 +52,7 @@ #include <QtCore/QRandomGenerator> #include <QtGui/QStandardItemModel> #include <QtCharts/QBarCategoryAxis> -#include <QtWidgets/QOpenGLWidget> +#include <QtOpenGLWidgets/QOpenGLWidget> #include <qmath.h> diff --git a/tests/manual/wavechart/main.cpp b/tests/manual/wavechart/main.cpp index e18dec6b..7991f2db 100644 --- a/tests/manual/wavechart/main.cpp +++ b/tests/manual/wavechart/main.cpp @@ -30,7 +30,7 @@ #include "wavechart.h" #include <QtWidgets/QApplication> #include <QtWidgets/QMainWindow> -#include <QtWidgets/QOpenGLWidget> +#include <QtOpenGLWidgets/QOpenGLWidget> int main(int argc, char *argv[]) { |