diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 382872686ffe665abe54b1f8063408f120d7fe24..064f1f4d0720b8b834db6a7b7b5338ceaf79a14d 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -169,7 +169,6 @@ int BaseQtVersion::getUniqueId() BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected, const QString &autodetectionSource) : m_id(getUniqueId()), m_isAutodetected(isAutodetected), - m_autodetectionSource(autodetectionSource), m_hasDebuggingHelper(false), m_hasQmlDump(false), m_hasQmlDebuggingLibrary(false), @@ -183,7 +182,8 @@ BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected, m_hasExamples(false), m_hasDemos(false), m_hasDocumentation(false), - m_qmakeIsExecutable(true) + m_qmakeIsExecutable(true), + m_autodetectionSource(autodetectionSource) { ctor(qmakeCommand); } diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index f9f9cf76cdfe6176c2ed9d3f4b8208c657765ba6..e4908d24c0bc7e344b3d71461caaaf1ae2add3d7 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -250,32 +250,35 @@ private: void updateMkspec() const; void setId(int id); // used by the qtversionmanager for legacy restore // and by the qtoptionspage to replace Qt versions - QString m_displayName; + int m_id; - bool m_isAutodetected; - QString m_autodetectionSource; - mutable Utils::FileName m_sourcePath; + bool m_isAutodetected; mutable bool m_hasDebuggingHelper; // controlled by m_versionInfoUpToDate mutable bool m_hasQmlDump; // controlled by m_versionInfoUpToDate mutable bool m_hasQmlDebuggingLibrary; // controlled by m_versionInfoUpdate mutable bool m_hasQmlObserver; // controlled by m_versionInfoUpToDate - mutable bool m_mkspecUpToDate; - mutable Utils::FileName m_mkspec; - mutable Utils::FileName m_mkspecFullPath; - mutable bool m_mkspecReadUpToDate; mutable bool m_defaultConfigIsDebug; mutable bool m_defaultConfigIsDebugAndRelease; - mutable QHash<QString, QString> m_mkspecValues; - mutable bool m_versionInfoUpToDate; - mutable QHash<QString,QString> m_versionInfo; mutable bool m_installed; mutable bool m_hasExamples; mutable bool m_hasDemos; mutable bool m_hasDocumentation; + mutable bool m_qmakeIsExecutable; + + QString m_displayName; + QString m_autodetectionSource; + mutable Utils::FileName m_sourcePath; + + mutable Utils::FileName m_mkspec; + mutable Utils::FileName m_mkspecFullPath; + + mutable QHash<QString, QString> m_mkspecValues; + + mutable QHash<QString,QString> m_versionInfo; mutable Utils::FileName m_qmakeCommand; mutable QString m_qtVersionString; @@ -285,7 +288,6 @@ private: mutable QString m_qmlsceneCommand; mutable QString m_qmlviewerCommand; - mutable bool m_qmakeIsExecutable; mutable QList<ProjectExplorer::Abi> m_qtAbis; }; }