diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-08 16:17:12 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-28 16:52:41 +0100 |
| commit | 4d761eaaf852f8d82925e111150f25c0dd5f3e83 (patch) | |
| tree | ddb0b777bbf2a2e52b0e8c1ac889aa63c5d54aef /sources/pyside6/libpyside/signalmanager.cpp | |
| parent | a2486060f78a42739d88a460b47f23b0c75b4a79 (diff) | |
Adapt to renaming of namespace QAudio->QtAudio
- Adapt the examples.
- Create an alias into the module.
- Add a hack to the signal manager for signals which
maintain the old string-based signature.
Task-number: PYSIDE-2497
Change-Id: I9db5e59851a2cb9161fdcecf87e78d980eda2045
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/signalmanager.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/signalmanager.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp index b4e1bb487..1738fa926 100644 --- a/sources/pyside6/libpyside/signalmanager.cpp +++ b/sources/pyside6/libpyside/signalmanager.cpp @@ -30,6 +30,8 @@ #include <limits> #include <memory> +using namespace Qt::StringLiterals; + #if QSLOT_CODE != 1 || QSIGNAL_CODE != 2 #error QSLOT_CODE and/or QSIGNAL_CODE changed! change the hardcoded stuff to the correct value! #endif @@ -715,7 +717,13 @@ static PyObject *parseArguments(const QList<QByteArray>& paramTypes, void **args for (qsizetype i = 0; i < argsSize; ++i) { void *data = args[i+1]; - const char *dataType = paramTypes[i].constData(); + auto param = paramTypes.at(i); +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals + if (param.startsWith("QAudio::"_ba)) + param.insert(1, 't'); +#endif + const char *dataType = param.constData(); Shiboken::Conversions::SpecificConverter converter(dataType); if (converter) { PyTuple_SET_ITEM(preparedArgs, i, converter.toPython(data)); |