From 7f30c3b137b440a5b7da538622d2ddbaf59b6e31 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Mon, 4 Jul 2022 12:54:26 +0200
Subject: [PATCH] Utils: Allow placeholder text for path chooser aspect

Change-Id: Ic2b27c1b239031e739322a6afbc6b30f293abda6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/libs/utils/aspects.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index 79f6428a4a2..61fc341f832 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -1091,6 +1091,9 @@ void StringAspect::addToLayout(LayoutBuilder &builder)
             d->m_pathChooserDisplay->setDefaultValue(defaultValue().toString());
         else
             d->m_pathChooserDisplay->setFilePath(FilePath::fromUserInput(displayedString));
+        // do not override default value with placeholder, but use placeholder if default is empty
+        if (d->m_pathChooserDisplay->lineEdit()->placeholderText().isEmpty())
+            d->m_pathChooserDisplay->lineEdit()->setPlaceholderText(d->m_placeHolderText);
         d->updateWidgetFromCheckStatus(this, d->m_pathChooserDisplay.data());
         addLabeledItem(builder, d->m_pathChooserDisplay);
         useMacroExpander(d->m_pathChooserDisplay->lineEdit());