diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-17 12:16:45 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-17 16:44:30 +0200 |
| commit | bae4d3de0f4bb18fc543767c462c47f07d1f600c (patch) | |
| tree | b8e28ee2711b707c01de237adf74f577a6455c27 | |
| parent | 34ad3ef15c9c3c76ec38d1377cb20ba810c36649 (diff) | |
remove special ActiveQt case from moduleNameWithoutPrefix
Change-Id: I03f52f26fe8b8b657177d7a3128231619788ebb2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index a6a691b88..3a3ab3663 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -59,10 +59,10 @@ QtModuleInfo::QtModuleInfo(const QString &name, const QString &qbsName, const QS QString QtModuleInfo::moduleNameWithoutPrefix() const { - if (name.startsWith(QLatin1String("Qt"))) + if (modulePrefix.isEmpty() && name.startsWith(QLatin1String("Qt"))) return name.mid(2); // Strip off "Qt". - if (name.startsWith(QLatin1String("QAx"))) - return name.mid(1); // Strip off "Q". + if (name.startsWith(modulePrefix)) + return name.mid(modulePrefix.length()); return name; } |