QOpenGLFunctions: fix -Wunused-private-field (Clang 15)
I see this with -unity-build -unity-build-batch-size 32, but I don't know whether it's unity-build or just Clang 15, so also pick to 6.2. The issue exists in 5.15, too, presumably, but I have no desire to find a non-C++17 fix. It appears the generator (glgen) is out-of-sync with the state of its supposed output as of at least 18aae36a90c0753f1b1e615ba8437d8ebd1bd2fb, so don't try to update the generator (I failed to find where these fields originate from, anyway). Pick-to: 6.6 6.5 6.2 Task-number: QTBUG-115031 Change-Id: Ia27620b8f8034c3e8eff383abb849e6ce93dce8a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
parent
a4125f421b
commit
4443d392e4
@ -44,7 +44,6 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -656,7 +656,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
};
|
||||
|
||||
// OpenGL 1.0 core functions
|
||||
|
@ -45,7 +45,6 @@ QOpenGLFunctions_2_1::QOpenGLFunctions_2_1()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -667,7 +667,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
};
|
||||
|
||||
// OpenGL 1.0 core functions
|
||||
|
@ -46,8 +46,6 @@ QOpenGLFunctions_3_0::QOpenGLFunctions_3_0()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, m_reserved_3_0_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -756,8 +756,8 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
void *m_reserved_3_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_3_0_Deprecated = nullptr; // To maintain BC
|
||||
};
|
||||
|
||||
// OpenGL 1.0 core functions
|
||||
|
@ -48,8 +48,6 @@ QOpenGLFunctions_3_2_Compatibility::QOpenGLFunctions_3_2_Compatibility()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, m_reserved_3_0_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -797,8 +797,8 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
void *m_reserved_3_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_3_0_Deprecated = nullptr; // To maintain BC
|
||||
};
|
||||
|
||||
// OpenGL 1.0 core functions
|
||||
|
@ -49,7 +49,6 @@ QOpenGLFunctions_3_3_Compatibility::QOpenGLFunctions_3_3_Compatibility()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, d_3_3_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
@ -860,7 +860,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated;
|
||||
};
|
||||
|
||||
|
@ -50,7 +50,6 @@ QOpenGLFunctions_4_0_Compatibility::QOpenGLFunctions_4_0_Compatibility()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, d_3_3_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
@ -911,7 +911,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated;
|
||||
};
|
||||
|
||||
|
@ -51,7 +51,6 @@ QOpenGLFunctions_4_1_Compatibility::QOpenGLFunctions_4_1_Compatibility()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, d_3_3_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
@ -1004,7 +1004,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated;
|
||||
};
|
||||
|
||||
|
@ -52,7 +52,6 @@ QOpenGLFunctions_4_2_Compatibility::QOpenGLFunctions_4_2_Compatibility()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, d_3_3_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
@ -1027,7 +1027,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated;
|
||||
};
|
||||
|
||||
|
@ -53,7 +53,6 @@ QOpenGLFunctions_4_3_Compatibility::QOpenGLFunctions_4_3_Compatibility()
|
||||
, d_1_2_Deprecated(nullptr)
|
||||
, d_1_3_Deprecated(nullptr)
|
||||
, d_1_4_Deprecated(nullptr)
|
||||
, m_reserved_2_0_Deprecated(nullptr)
|
||||
, d_3_3_Deprecated(nullptr)
|
||||
{
|
||||
}
|
||||
|
@ -1065,7 +1065,7 @@ private:
|
||||
QOpenGLFunctions_1_2_DeprecatedBackend* d_1_2_Deprecated;
|
||||
QOpenGLFunctions_1_3_DeprecatedBackend* d_1_3_Deprecated;
|
||||
QOpenGLFunctions_1_4_DeprecatedBackend* d_1_4_Deprecated;
|
||||
void *m_reserved_2_0_Deprecated; // To maintain BC
|
||||
Q_DECL_UNUSED_MEMBER void *m_reserved_2_0_Deprecated = nullptr; // To maintain BC
|
||||
QOpenGLFunctions_3_3_DeprecatedBackend* d_3_3_Deprecated;
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user