mirror of https://github.com/qt/qtgraphs.git
Include what you use: qquaternion.h
qmatrix4x4.h will lose its qquaternion.h include, so include
qquaternion.h explicitly in all files that mention 'QQuaternion',
unless, for a foo.cpp, the own foo.h has already included it.
Also add forward declarations, where needed.
Amends the start of this module's history.
Pick-to: 6.9 6.8
Change-Id: I605bf742be5bb92a676704f12d738d241bd9b0da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 6a44c5fe57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
7a25a45ced
commit
e23fb8de70
|
|
@ -8,7 +8,9 @@
|
|||
#include <QtCore/qmath.h>
|
||||
#include <QtGraphs/qgraphstheme.h>
|
||||
#include <QtGraphs/qvalue3daxis.h>
|
||||
|
||||
#include <QtGui/qimage.h>
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
using namespace Qt::StringLiterals;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
#include "qvalue3daxis_p.h"
|
||||
#include "qgraphs3dlogging_p.h"
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QBar3DSeriesPrivate;
|
||||
class QQuaternion;
|
||||
|
||||
class Q_GRAPHS_EXPORT QBar3DSeries : public QAbstract3DSeries
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
#include "qcustom3dvolume_p.h"
|
||||
#include "qgraphs3dlogging_p.h"
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QCustom3DVolumePrivate;
|
||||
class QQuaternion;
|
||||
|
||||
class Q_GRAPHS_EXPORT QCustom3DVolume : public QCustom3DItem
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QQuaternion;
|
||||
|
||||
struct QCustomVolumeDirtyBitField
|
||||
{
|
||||
bool textureDimensionsDirty : 1;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
#include "qscatter3dseries_p.h"
|
||||
#include "scatteritemmodelhandler_p.h"
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
#include <QtGraphs/qgraphsglobal.h>
|
||||
#include <private/qquick3dinstancing_p.h>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
struct BarItemHolder
|
||||
{
|
||||
QVector3D position = {.0f, .0f, .0f};
|
||||
|
|
|
|||
|
|
@ -17,6 +17,8 @@
|
|||
#include <QtGraphs/qgraphsglobal.h>
|
||||
#include <private/qquick3dinstancing_p.h>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
struct DataItemHolder
|
||||
{
|
||||
QVector3D position;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
#include <QtQuick3D/private/qquick3drepeater_p.h>
|
||||
#include <QtQuick/qquickitemgrabresult.h>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
/*!
|
||||
* \qmltype Bars3D
|
||||
* \inherits GraphsItem3D
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@
|
|||
#include <QtQuick3D/private/qquick3dprincipledmaterial_p.h>
|
||||
#include <QtQuick3D/private/qquick3drepeater_p.h>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
#if defined(Q_OS_IOS)
|
||||
#include <QtCore/QTimer>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ class QCustom3DVolume;
|
|||
class QCustom3DLabel;
|
||||
class QGraphsInputHandler;
|
||||
class QGraphsTheme;
|
||||
class QQuaternion;
|
||||
class QQuick3DCustomMaterial;
|
||||
class QQuick3DDirectionalLight;
|
||||
class QQuick3DPrincipledMaterial;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#include <QtQuick3D/private/qquick3dprincipledmaterial_p.h>
|
||||
#include <QtQuick3D/private/qquick3drepeater_p.h>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
static const int insertRemoveRecordReserveSize = 31;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
#include <QtGraphs/QBar3DSeries>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
class tst_series: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
#include "cpptestutil.h"
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
class tst_custom: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
#include <QtGraphs/QCustom3DItem>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
class tst_custom: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
#include <QtGraphs/QScatter3DSeries>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
class tst_series: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
|
||||
#include <QtGraphs/QSpline3DSeries>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
class tst_series : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@
|
|||
#include <QtGraphs/q3dscene.h>
|
||||
#include <QtGraphs/qgraphstheme.h>
|
||||
#include <QtGraphs/qcustom3ditem.h>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
#include <QtCore/QRandomGenerator>
|
||||
#include <QtCore/QElapsedTimer>
|
||||
#include <QtCore/qmath.h>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
#include <qmath.h>
|
||||
#include <QComboBox>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
const int numberOfCols = 8;
|
||||
const int numberOfRows = 8;
|
||||
const float limit = 8.0f;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@
|
|||
#include <QtGraphs/q3dscene.h>
|
||||
#include <QtGraphs/qscatter3dseries.h>
|
||||
#include <QtGraphs/QCustom3DItem>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
#include <QtCore/qmath.h>
|
||||
|
||||
static const float verticalRange = 8.0f;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
#include <QtGui/QRgb>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
#include <QtGui/qquaternion.h>
|
||||
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
const int imageCount = 512;
|
||||
|
|
|
|||
Loading…
Reference in New Issue