feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Improvements with version detection

Browse Source 
Task-number: QTCREATORBUG-25261
Change-Id: I1b378eb4a4d132b64e4c36e0a0cdafd402570785
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christiaan Janssen
2021-03-04 17:07:49 +01:00
committed by christiaan.janssen
parent 08f8dd355d
commit b5781e6028
4 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/mcusupport/mcusupportversiondetection.h
View File

@@ -31,7 +31,8 @@
namespace McuSupport {
namespace Internal {
class McuPackageVersionDetector : public QObject {
class McuPackageVersionDetector : public QObject
{
Q_OBJECT
public:
McuPackageVersionDetector();
@@ -40,7 +41,8 @@ public:
};
// Get version from the output of an executable
class McuPackageExecutableVersionDetector : public McuPackageVersionDetector {
class McuPackageExecutableVersionDetector : public McuPackageVersionDetector
{
public:
McuPackageExecutableVersionDetector(const QString &detectionPath,
const QStringList &detectionArgs,
@@ -53,7 +55,8 @@ private:
};
// Get version through parsing an XML file
class McuPackageXmlVersionDetector : public McuPackageVersionDetector {
class McuPackageXmlVersionDetector : public McuPackageVersionDetector
{
public:
McuPackageXmlVersionDetector(const QString &filePattern,
const QString &elementName,
@@ -68,7 +71,8 @@ private:
};
// Get version from the filename of a given file/dir in the package directory
class McuPackageDirectoryVersionDetector : public McuPackageVersionDetector {
class McuPackageDirectoryVersionDetector : public McuPackageVersionDetector
{
public:
McuPackageDirectoryVersionDetector(const QString &filePattern, const QString &versionRegExp, const bool isFile);
QString parseVersion(const QString &packagePath) const;
@@ -79,7 +83,8 @@ private:
};
// Get version from the path of the package itself
class McuPackagePathVersionDetector : public McuPackageVersionDetector {
class McuPackagePathVersionDetector : public McuPackageVersionDetector
{
public:
McuPackagePathVersionDetector(const QString &versionRegExp);
QString parseVersion(const QString &packagePath) const;