summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-06 10:20:49 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-06 12:20:50 +0100
commit94c16517b3f8f01309a89598e698931ef77d60db (patch)
tree5643460504dfd2a436b57642d28387b7a81ca438 /src/tools/uic/cpp
parentc4b32597e789b259a4881c76f51a6c7150d2bc10 (diff)
uic: Generate string-based connections for QLCDNumber::display()
There are still ambiguous overloads of display(), which cause PMF-syntax to fail. Pick-to: 6.5 6.4 Task-number: QTBUG-110952 Change-Id: I0887a5a06b026e4d5a20ef732d5892c8ac7fb6db Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/tools/uic/cpp')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index d87e56d20f..d791f9cb54 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -2605,6 +2605,10 @@ ConnectionSyntax WriteInitialization::connectionSyntax(const language::SignalSlo
return ConnectionSyntax::StringBased;
}
+ // QTBUG-110952, ambiguous overloads of display()
+ if (receiver.className == u"QLCDNumber" && receiver.signature.startsWith(u"display("))
+ return ConnectionSyntax::StringBased;
+
if ((sender.name == m_mainFormVarName && m_customSignals.contains(sender.signature))
|| (receiver.name == m_mainFormVarName && m_customSlots.contains(receiver.signature))) {
return ConnectionSyntax::StringBased;