diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-17 12:15:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-17 16:03:43 +0200 |
| commit | 13626f733c184a7c65add69efef57ff2e6dd9cde (patch) | |
| tree | f7846a7aceb68ea36f66cfed76232ca0f5fe8206 /src | |
| parent | 9bebb09fdef0d31f59223f446ad809a703f9a0ad (diff) | |
rename QtModuleInfo::moduleName to moduleNameWithoutPrefix
...because that's what it returns.
Change-Id: Ie0c8f27ea1d6b686fc1f825dbc8b42c56f1a7b68
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.cpp | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.h | 2 | ||||
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index 8f84487fb..a6a691b88 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -57,7 +57,7 @@ QtModuleInfo::QtModuleInfo(const QString &name, const QString &qbsName, const QS dependencies.prepend(coreModule); } -QString QtModuleInfo::moduleName() const +QString QtModuleInfo::moduleNameWithoutPrefix() const { if (name.startsWith(QLatin1String("Qt"))) return name.mid(2); // Strip off "Qt". diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.h b/src/lib/qtprofilesetup/qtmoduleinfo.h index e7d4d0eef..862da5acc 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.h +++ b/src/lib/qtprofilesetup/qtmoduleinfo.h @@ -44,7 +44,7 @@ public: QtModuleInfo(const QString &name, const QString &qbsName, const QStringList &deps = QStringList()); - QString moduleName() const; + QString moduleNameWithoutPrefix() const; QString frameworkHeadersPath(const QtEnvironment &qtEnvironment) const; QStringList qt4ModuleIncludePaths(const QtEnvironment &qtEnvironment) const; QString libraryBaseName(const QtEnvironment &qtEnvironment, bool debugBuild) const; diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 064d47128..6c955f333 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -86,7 +86,7 @@ static QString defaultQpaPlugin(const Profile &profile, const QtModuleInfo &modu static void replaceSpecialValues(QByteArray *content, const Profile &profile, const QtModuleInfo &module, const QtEnvironment &qtEnvironment) { - content->replace("@name@", utf8JSLiteral(module.moduleName())); + content->replace("@name@", utf8JSLiteral(module.moduleNameWithoutPrefix())); content->replace("@has_library@", utf8JSLiteral(module.hasLibrary)); content->replace("@dependencies@", utf8JSLiteral(module.dependencies)); content->replace("@includes@", utf8JSLiteral(module.includePaths)); |