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

Use proper way of looking for system Qt

Browse Source 
Change-Id: I770a15c653c6b25d10a919f6c6dbefdb79c17d89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-07-29 17:04:28 +02:00
parent f69da8e770
commit 96ba1dd4a7
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qtsupport/qtkitinformation.cpp
View File

@@ -34,7 +34,7 @@
#include "qtversionmanager.h" #include "qtversionmanager.h"
#include "qtparser.h" #include "qtparser.h"
#include <utils/environment.h> #include <utils/buildablehelperlibrary.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
namespace QtSupport { namespace QtSupport {
@@ -66,8 +66,7 @@ QVariant QtKitInformation::defaultValue(ProjectExplorer::Kit *k) const
QtVersionManager *mgr = QtVersionManager::instance(); QtVersionManager *mgr = QtVersionManager::instance();
// find "Qt in PATH": // find "Qt in PATH":
Utils::FileName qmake = Utils::FileName::fromString(Utils::Environment::systemEnvironment() Utils::FileName qmake = Utils::BuildableHelperLibrary::findSystemQt(Utils::Environment::systemEnvironment());
.searchInPath(QLatin1String("qmake")));
if (qmake.isEmpty()) if (qmake.isEmpty())
return -1; return -1;