diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 49db754c7ab..4556722f22b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -175,7 +175,7 @@ BaseQtVersion::BaseQtVersion(const QString &qmakeCommand, bool isAutodetected, c m_defaultConfigIsDebug(true), m_defaultConfigIsDebugAndRelease(true), m_versionInfoUpToDate(false), - m_notInstalled(false), + m_installed(true), m_hasExamples(false), m_hasDemos(false), m_hasDocumentation(false), @@ -196,7 +196,7 @@ BaseQtVersion::BaseQtVersion() m_defaultConfigIsDebug(true), m_defaultConfigIsDebugAndRelease(true), m_versionInfoUpToDate(false), - m_notInstalled(false), + m_installed(true), m_hasExamples(false), m_hasDemos(false), m_hasDocumentation(false), @@ -297,7 +297,7 @@ bool BaseQtVersion::isValid() const updateMkspec(); return !qmakeCommand().isEmpty() - && !m_notInstalled + && m_installed && m_versionInfo.contains("QT_INSTALL_BINS") && !m_mkspecFullPath.isEmpty() && m_qmakeIsExecutable; @@ -311,7 +311,7 @@ QString BaseQtVersion::invalidReason() const return QCoreApplication::translate("QtVersion", "No qmake path set"); if (!m_qmakeIsExecutable) return QCoreApplication::translate("QtVersion", "qmake does not exist or is not executable"); - if (m_notInstalled) + if (!m_installed) return QCoreApplication::translate("QtVersion", "Qt version is not properly installed, please run make install"); if (!m_versionInfo.contains("QT_INSTALL_BINS")) return QCoreApplication::translate("QtVersion", @@ -745,7 +745,7 @@ void BaseQtVersion::updateVersionInfo() const // extract data from qmake executable m_versionInfo.clear(); - m_notInstalled = false; + m_installed = true; m_hasExamples = false; m_hasDocumentation = false; m_hasDebuggingHelper = false; @@ -777,12 +777,12 @@ void BaseQtVersion::updateVersionInfo() const if (m_versionInfo.contains("QT_INSTALL_BINS")) { QFileInfo fi(m_versionInfo.value("QT_INSTALL_BINS")); if (!fi.exists()) - m_notInstalled = true; + m_installed = false; } if (m_versionInfo.contains("QT_INSTALL_HEADERS")){ QFileInfo fi(m_versionInfo.value("QT_INSTALL_HEADERS")); if (!fi.exists()) - m_notInstalled = true; + m_installed = false; } if (m_versionInfo.contains("QT_INSTALL_DOCS")){ QFileInfo fi(m_versionInfo.value("QT_INSTALL_DOCS")); diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index f525d5d62c3..c092d196487 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -256,7 +256,7 @@ private: mutable bool m_versionInfoUpToDate; mutable QHash m_versionInfo; - mutable bool m_notInstalled; + mutable bool m_installed; mutable bool m_hasExamples; mutable bool m_hasDemos; mutable bool m_hasDocumentation;