diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2022-01-20 17:45:14 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-21 18:25:38 +0000 |
| commit | 9459fab5c7c56e0bf09c887d176ff447ca2b6e83 (patch) | |
| tree | 4ab29574e9f16f0271882c66831689c049411102 /src | |
| parent | b33fd136ca709f7dbb11a77cd6e2a58849f3fd44 (diff) | |
Use the deprecation macro for CustomCompileStep
Change-Id: Ie0752cdec61373f75c312995de414ca96e0695c4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 3a46d09c544d445258b96413074cea335a3b18a4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index cf74ca0138..634d7e0b87 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -57,7 +57,12 @@ public: RequiresFullMatrix = 0x0008 | RequiresFullMatrixExceptTranslate, NoBatching = 0x0010, - CustomCompileStep = NoBatching // ### Qt 7: remove +#if QT_DEPRECATED_SINCE(6, 3) + CustomCompileStep Q_DECL_ENUMERATOR_DEPRECATED_X( + "Qt 6 does not have custom shader compilation support. If the intention is to just disable batching, use NoBatching instead." + ) = NoBatching +#endif + }; Q_DECLARE_FLAGS(Flags, Flag) |