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-03 13:26:15 +0100 |
| commit | 8430d4e02940c2d3fd9493044e05f9e113c07001 (patch) | |
| tree | 1b0adfbce6678a6364223735fa70a1d447531591 /sources/shiboken6/ApiExtractor/messages.h | |
| parent | 29d41de05abcfc1dbe3eb2125ab518655aecb326 (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]
Pick-to: 6.2 5.15
Change-Id: I56375c5bbc483859f83658cfeb4df1e6067421a0
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/messages.h')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/messages.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/shiboken6/ApiExtractor/messages.h b/sources/shiboken6/ApiExtractor/messages.h index d53164dcb..43fe7a66c 100644 --- a/sources/shiboken6/ApiExtractor/messages.h +++ b/sources/shiboken6/ApiExtractor/messages.h @@ -220,7 +220,8 @@ QString msgCannotFindView(const QString &viewedName, const QString &name); QString msgCannotFindSnippet(const QString &file, const QString &snippetLabel); QString msgCyclicDependency(const QString &funcName, const QString &graphName, - const QList<const AbstractMetaFunction *> &involvedConversions); + const AbstractMetaFunctionCList &cyclic, + const AbstractMetaFunctionCList &involvedConversions); QString msgClassNotFound(const TypeEntry *t); |