From 33a82f787663152551774fa2562ce7bfb10fbc2a Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Feb 2019 18:28:58 +0100 Subject: [PATCH] QtSupport: De-virtualize some more BaseQtVersion member functions ... that were never overridden. Change-Id: Icd1e2b706b020aa20f0c08b48b30af99f99cad38 Reviewed-by: Christian Kandeler --- src/plugins/qtsupport/baseqtversion.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index da3e0fce9b2..92c502f2b9c 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -155,9 +155,9 @@ public: bool isSubProject(const Utils::FileName &filePath) const; // used by UiCodeModelSupport - virtual QString uicCommand() const; - virtual QString designerCommand() const; - virtual QString linguistCommand() const; + QString uicCommand() const; + QString designerCommand() const; + QString linguistCommand() const; QString qscxmlcCommand() const; QString qtVersionString() const; @@ -172,7 +172,7 @@ public: bool hasDemos() const; QString demosPath() const; - virtual QString frameworkInstallPath() const; + QString frameworkInstallPath() const; // former local functions Utils::FileName qmakeCommand() const; @@ -208,11 +208,11 @@ public: static bool isQtQuickCompilerSupported(ProjectExplorer::Kit *k, QString *reason = nullptr); bool isQtQuickCompilerSupported(QString *reason = nullptr) const; - virtual QString qmlDumpTool(bool debugVersion) const; + QString qmlDumpTool(bool debugVersion) const; - virtual bool hasQmlDump() const; - virtual bool hasQmlDumpWithRelocatableFlag() const; - virtual bool needsQmlDump() const; + bool hasQmlDump() const; + bool hasQmlDumpWithRelocatableFlag() const; + bool needsQmlDump() const; virtual QtConfigWidget *createConfigurationWidget() const;