From 992df45cd54b907aa1ce2f2cd148136eb0af3884 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 13 Feb 2019 18:08:07 +0100
Subject: [PATCH] QtSupport: De-virtualize BaseQtVersion::sourcePath

... as it was never re-implemented. Also inline the private
BaseQtVersion::updateSourcePath in this only user.

Change-Id: I505395b5e9b0723ceab790f3b776cea12fe64780
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/qtsupport/baseqtversion.cpp | 13 ++++---------
 src/plugins/qtsupport/baseqtversion.h   |  3 +--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 376e5f23fc7..ecef52c9d1c 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -744,17 +744,12 @@ QString BaseQtVersion::toHtml(bool verbose) const
     return rc;
 }
 
-void BaseQtVersion::updateSourcePath() const
-{
-    if (!m_sourcePath.isEmpty())
-        return;
-    updateVersionInfo();
-    m_sourcePath = sourcePath(m_versionInfo);
-}
-
 FileName BaseQtVersion::sourcePath() const
 {
-    updateSourcePath();
+    if (m_sourcePath.isEmpty()) {
+        updateVersionInfo();
+        m_sourcePath = sourcePath(m_versionInfo);
+    }
     return m_sourcePath;
 }
 
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 34627bfb627..da3e0fce9b2 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -148,7 +148,7 @@ public:
     virtual Utils::Environment qmakeRunEnvironment() const;
 
     // source path defined by qmake property QT_INSTALL_PREFIX/src or by qmake.stash QT_SOURCE_TREE
-    virtual Utils::FileName sourcePath() const;
+    Utils::FileName sourcePath() const;
     // returns source path for installed qt packages and empty string for self build qt
     Utils::FileName qtPackageSourcePath() const;
     bool isInSourceDirectory(const Utils::FileName &filePath);
@@ -270,7 +270,6 @@ protected:
 
 private:
     void setAutoDetectionSource(const QString &autodetectionSource);
-    void updateSourcePath() const;
     void updateVersionInfo() const;
     enum HostBinaries { Designer, Linguist, Uic, QScxmlc };
     QString findHostBinary(HostBinaries binary) const;