diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 12:47:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-11 12:47:05 +0200 |
| commit | 73d0fe549b223aa16544d04754a3301f4640f6d6 (patch) | |
| tree | c6f0ad1b372b7ff818b282335415f8ce737b39bd /sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | |
| parent | 5c3002ebae8e31b3aa05a43e418b196653b041d6 (diff) | |
| parent | f2e63d3588c8422d84d9ff5480427a83d68083bb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6cf604e1ae7234ce4f0d99169e9269a7dde07a4a
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.cpp')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 0e8809e97..fe0d2765c 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -557,7 +557,7 @@ QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction { QString value = arg->defaultValueExpression(); - if (value.isEmpty() + if (value.isEmpty() || value == QLatin1String("{}") || arg->hasModifiedDefaultValueExpression() || isPointer(arg->type())) { return value; |