diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-03 08:34:15 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-03 08:49:05 +0000 |
| commit | 9f0a954cf5a661da3ad6dde3b0ab3ecf32119e29 (patch) | |
| tree | 5b6734fbfb9ef2d18878ba7bd8f0d22778aea592 /sources/shiboken2/generator/shiboken2/cppgenerator.cpp | |
| parent | 347a32255a2e8e3c6d73b94b1cfe74fddbe09aad (diff) | |
Remove most QT_VERSION checks
As a drive by, adapt to changed values of QMetaObject::Call.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Ic55a5da910c9ef022af3dedf749f80153f519ebf
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/cppgenerator.cpp')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 59187e454..f0c6398ee 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -842,11 +842,7 @@ QString CppGenerator::virtualMethodReturn(QTextStream &s, const QRegularExpressionMatch match = regex.match(expr, offset); if (!match.hasMatch()) break; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const int argId = match.capturedView(1).toInt() - 1; -#else - const int argId = match.capturedRef(1).toInt() - 1; -#endif if (argId < 0 || argId > func->arguments().count()) { qCWarning(lcShiboken, "The expression used in return value contains an invalid index."); break; |