summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidtoolchain.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-27 13:00:52 +0200
committerhjk <hjk@qt.io>2019-05-28 05:50:15 +0000
commit33a9a03121c1ee4b2c56f8024a457b27b202d622 (patch)
tree5f590cea1f1d2ebbd8a7be17a9cd39d234cae07a /src/plugins/android/androidtoolchain.cpp
parent0be5fe5383e2202d1bfb1085b267370d7bed8ebd (diff)
downloadqt-creator-33a9a03121c1ee4b2c56f8024a457b27b202d622.tar.gz
Android: Avoid a temporary QFileInfo
Change-Id: I58f31177506c1e25f07dc51d5b24ac368ebf9024 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/android/androidtoolchain.cpp')
-rw-r--r--src/plugins/android/androidtoolchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 752b935ef0..8de0920e29 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -93,7 +93,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
env.set(QLatin1String("ANDROID_NDK_HOST"),
AndroidConfigurations::currentConfig().toolchainHost());
const Utils::FileName javaHome = AndroidConfigurations::currentConfig().openJDKLocation();
- if (!javaHome.isEmpty() && javaHome.toFileInfo().exists()) {
+ if (!javaHome.exists()) {
env.set(QLatin1String("JAVA_HOME"), javaHome.toString());
const FileName javaBin = javaHome.pathAppended("bin");
if (!Utils::contains(env.path(), [&javaBin](const Utils::FileName &p) { return p == javaBin; }))