From cb299e38e94520dd85cd6366b9ab0bfe3a43208f Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 3 Jul 2024 13:08:25 +0200
Subject: [PATCH] Aspects: Fix duplicate global variables

The global variables got added twice for StringAspects.

Fixes: QTCREATORBUG-31183
Change-Id: I3feaf56cbc78bae0bb2da8f5ba5327a2ca038810
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/aspects.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index e6b8267c4ed..996ac56fdb1 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -742,6 +742,8 @@ void BaseAspect::addMacroExpansion(QWidget *w)
         return;
     const auto chooser = new VariableChooser(w);
     chooser->addSupportedWidget(w);
+    if (d->m_expander == globalMacroExpander()) // default for VariableChooser()
+        return;
     chooser->addMacroExpanderProvider([this] { return d->m_expander; });
     if (auto pathChooser = qobject_cast<PathChooser *>(w))
         pathChooser->setMacroExpander(d->m_expander);