Vcpkg: Prefer environment variable over executable path

The executable can be in a different directory.

Change-Id: Ie630d464734d1ef9d0a9e1adfb8da8e56c67b5dd
Reviewed-by: Alessandro Portale <[email protected]>

Author: marbub

src/plugins/vcpkg/vcpkgsettings.cpp

@@ -35,10 +35,12 @@ VcpkgSettings::VcpkgSettings()
 
     vcpkgRoot.setSettingsKey("VcpkgRoot");
     vcpkgRoot.setExpectedKind(PathChooser::ExistingDirectory);
-    FilePath defaultPath = Environment::systemEnvironment().searchInPath(Constants::VCPKG_COMMAND)
-                               .parentDir();
+    FilePath defaultPath = FilePath::fromUserInput(
+        qtcEnvironmentVariable(Constants::ENVVAR_VCPKG_ROOT));
+
     if (!defaultPath.isDir())
-        defaultPath = FilePath::fromUserInput(qtcEnvironmentVariable(Constants::ENVVAR_VCPKG_ROOT));
+        defaultPath = Environment::systemEnvironment().searchInPath(Constants::VCPKG_COMMAND).parentDir();
+
     if (defaultPath.isDir())
         vcpkgRoot.setDefaultPathValue(defaultPath);