diff options
| author | hjk <hjk121@nokiamail.com> | 2014-10-13 18:49:44 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-10-15 00:49:56 +0200 |
| commit | 3119d93b7981c3b245f584e9663839312c9f1675 (patch) | |
| tree | d7ea160830984a31fa076e8ecca8668859895f22 /src/plugins/qtsupport/qtsupportplugin.cpp | |
| parent | e279c7e00787230dcd89301ebb7a182a35c0531b (diff) | |
VariableChooser: Rework
Allow multiple expanders to be registered for lineedits, e.g. a
local and the global ones, and actually show them.
Use a tree view in the chooser for somewhat more structured display.
Change-Id: I769f92144e5249f45e54381de52aa6973eb20118
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport/qtsupportplugin.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtsupportplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 03e7c7b93dc..f344c7045a1 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -46,12 +46,12 @@ #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> -#include <coreplugin/variablemanager.h> #include <coreplugin/jsexpander.h> + #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/target.h> - +#include <utils/macroexpander.h> #include <QtPlugin> @@ -114,7 +114,7 @@ static QString qmakeProperty(const char *propertyName) void QtSupportPlugin::extensionsInitialized() { - Utils::MacroExpander *expander = globalMacroExpander(); + Utils::MacroExpander *expander = Utils::globalMacroExpander(); expander->registerVariable(kHostBins, tr("Full path to the host bin directory of the current project's Qt version."), |