diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-12-19 12:23:17 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2023-02-10 12:37:17 +0100 |
| commit | c889af388062bbee6e52e68a22ac8632fb12ff02 (patch) | |
| tree | 0b4823adb8ca383e0a55fcbeb6e262363c42e0e8 /src/render/materialsystem/qshaderprogram.cpp | |
| parent | 390f724912eb73461295e68535e053eb27e28af9 (diff) | |
Remove Qt6 QT_VERSION checks from the code base
Those are left overs from the Qt 5.15 to Qt 6 port. Now that both
code based have diverged, there's no much point in keeping those
checks.
Pick-to: 6.5
Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/materialsystem/qshaderprogram.cpp')
| -rw-r--r-- | src/render/materialsystem/qshaderprogram.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index cbb1b77b5..de1d56bb6 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -841,11 +841,7 @@ QByteArray QShaderProgramPrivate::resolveAutoBindingIndices(const QByteArray &co do { matchStart = shaderCode.indexOf(regexp, matchStart); if (matchStart != -1) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const auto match = regexp.matchView(QStringView{shaderCode}.mid(matchStart)); -#else - const auto match = regexp.match(shaderCode.mid(matchStart)); -#endif const auto length = match.capturedLength(0); shaderCode.replace(matchStart, length, replacement.arg(variable++)); } |