feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Pass macroexpander (again) to WorkingDirectoryAspect

Browse Source 
Broke with 8dacb123e0.

Probably calls for a more centralized approach again. Later.

Change-Id: Ibf52487d68d7938d4b5dfb38f1f0a5b0e1a97bc3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2022-05-30 14:56:20 +02:00
parent 17ee387756
commit 2837f4d777
15 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/pathchooser.cpp
View File

@@ -192,7 +192,7 @@ public:
EnvironmentChange m_environmentChange;
BinaryVersionToolTipEventFilter *m_binaryVersionToolTipEventFilter = nullptr;
QList<QAbstractButton *> m_buttons;
MacroExpander *m_macroExpander = globalMacroExpander();
const MacroExpander *m_macroExpander = globalMacroExpander();
std::function<void()> m_openTerminal;
};
@@ -732,7 +732,7 @@ void PathChooser::setHistoryCompleter(const QString &historyKey, bool restoreLas
d->m_lineEdit->setHistoryCompleter(historyKey, restoreLastItemFromHistory);
}
void PathChooser::setMacroExpander(MacroExpander *macroExpander)
void PathChooser::setMacroExpander(const MacroExpander *macroExpander)
{
d->m_macroExpander = macroExpander;
}