diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-08 08:17:29 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-08 08:17:29 +0200 |
| commit | 66a0fa21efb94ac7cc16032213c91a33c0670e2f (patch) | |
| tree | 622759bac23da5d32d06aaa56805570698c10cdf /sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | |
| parent | 9698a678937c3dfd23e38b890a29b16ad6885d96 (diff) | |
| parent | e2774ff5350fa94352858672aa165a8ff22aa3b1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ibe15176ae36ea31bd1799d9bf8a39b57f9338ca0
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.cpp')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 6d94af248..a94d3c8a7 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -573,11 +573,11 @@ QString ShibokenGenerator::guessScopeForDefaultValue(const AbstractMetaFunction { QString value = arg->defaultValueExpression(); - if (value.isEmpty()) - return QString(); - - if (isPointer(arg->type())) + if (value.isEmpty() + || arg->hasModifiedDefaultValueExpression() + || isPointer(arg->type())) { return value; + } static const QRegularExpression enumValueRegEx(QStringLiteral("^([A-Za-z_]\\w*)?$")); Q_ASSERT(enumValueRegEx.isValid()); |