From 850a35aae5b9854e1490e68fa5ee1277ff7332db Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 15 May 2018 17:36:45 +0200 Subject: [PATCH] QtSupport: Improve the qtquickcompiler feature detection Check for qtquickcompiler.prf instead of for the binary. That is compatible with (commercial) Qt < 5.11 with the original qtquickcompiler, and now additionally with Qt >= 5.11 with qmlcachegen. Task-number: QTCREATORBUG-19993 Change-Id: Ie0ba30a590828f13b330a62acb9d1d5c84a5916b Reviewed-by: Simon Hausmann Reviewed-by: Eike Ziller --- src/plugins/qtsupport/baseqtversion.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 12941ee0d23..289409fc081 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1815,9 +1815,8 @@ bool BaseQtVersion::isQtQuickCompilerSupported(QString *reason) const return false; } - const QString qtQuickCompilerExecutable = - HostOsInfo::withExecutableSuffix(binPath().toString() + "/qtquickcompiler"); - if (!QFileInfo::exists(qtQuickCompilerExecutable)) { + const QString qtQuickCompilerPrf = mkspecsPath().toString() + "/features/qtquickcompiler.prf"; + if (!QFileInfo::exists(qtQuickCompilerPrf)) { if (reason) *reason = QCoreApplication::translate("BaseQtVersion", "This Qt Version does not contain Qt Quick Compiler."); return false;