diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-03 10:32:29 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-04 14:42:33 +0100 |
| commit | 6bff39f3f291feedd104d7ad385b3209fa15f3c6 (patch) | |
| tree | f81ac4d4fdb52d651bf51eaac4719eed4a751619 /examples/scriptableapplication/pythonutils.cpp | |
| parent | 380ac3cae4f0224d0c0e92b5e78a83ac3d7dc688 (diff) | |
shiboken6: Clean up messages about cyclic dependencies of overloaded functions
Move message helper msgCyclicDependency() from overloaddata.cpp
to message.cpp to prevent a clash between the static helper
and the one declared in messages.h.
This was an oversight causing problems in 5.15:
tqtc-pyside-setup/sources/shiboken2/generator/shiboken2/overloaddata.cpp: In function ‘QString msgCyclicDependency(const QString&, const QString&, const MetaFunctionList&)’:
tqtc-pyside-setup/sources/shiboken2/generator/shiboken2/overloaddata.cpp:151:16: error: ‘QString msgCyclicDependency(const QString&, const QString&, const MetaFunctionList&)’
was declared ‘extern’ and later ‘static’ [-fpermissive]
Change-Id: I56375c5bbc483859f83658cfeb4df1e6067421a0
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 8430d4e02940c2d3fd9493044e05f9e113c07001)
Diffstat (limited to 'examples/scriptableapplication/pythonutils.cpp')
0 files changed, 0 insertions, 0 deletions