diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-05-30 23:29:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-06-05 09:07:14 +0200 |
| commit | c49728eb27be0f3f2eaaa77b0ed573f5d8705af1 (patch) | |
| tree | 7115e967f463ab66c8df40dfd573cf5c8ddb8055 /qmake/generators/win32 | |
| parent | 690abaac0e4bd57b5510e68730f7965c01a113da (diff) | |
Port qmake from QStringRef to QStringView
Change-Id: Ie07a976cd3c634e04c8b9b1e0a6cacd4c2d94939
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 8 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.h | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index e79e804266..432525ffba 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -64,13 +64,13 @@ MingwMakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) return MakefileGenerator::parseLibFlag(flag, arg); } -bool MingwMakefileGenerator::processPrlFileBase(QString &origFile, const QStringRef &origName, - const QStringRef &fixedBase, int slashOff) +bool MingwMakefileGenerator::processPrlFileBase(QString &origFile, QStringView origName, + QStringView fixedBase, int slashOff) { - if (origName.startsWith("lib")) { + if (origName.startsWith(u"lib")) { QString newFixedBase = fixedBase.left(slashOff) + fixedBase.mid(slashOff + 3); if (Win32MakefileGenerator::processPrlFileBase(origFile, origName, - QStringRef(&newFixedBase), slashOff)) { + QStringView(newFixedBase), slashOff)) { return true; } } diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index 6ab1c95a94..6c1f0086cc 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -39,8 +39,8 @@ protected: using MakefileGenerator::escapeDependencyPath; QString escapeDependencyPath(const QString &path) const override; ProString fixLibFlag(const ProString &lib) override; - bool processPrlFileBase(QString &origFile, const QStringRef &origName, - const QStringRef &fixedBase, int slashOff) override; + bool processPrlFileBase(QString &origFile, QStringView origName, + QStringView fixedBase, int slashOff) override; bool writeMakefile(QTextStream &) override; void init() override; QString installRoot() const override; diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index a5d96483a8..0c32be8ef6 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -194,8 +194,8 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) return true; } -bool Win32MakefileGenerator::processPrlFileBase(QString &origFile, const QStringRef &origName, - const QStringRef &fixedBase, int slashOff) +bool Win32MakefileGenerator::processPrlFileBase(QString &origFile, QStringView origName, + QStringView fixedBase, int slashOff) { if (MakefileGenerator::processPrlFileBase(origFile, origName, fixedBase, slashOff)) return true; diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h index 265e54204e..180bd0fde8 100644 --- a/qmake/generators/win32/winmakefile.h +++ b/qmake/generators/win32/winmakefile.h @@ -56,8 +56,8 @@ protected: LibFlagType parseLibFlag(const ProString &flag, ProString *arg) override; ProString fixLibFlag(const ProString &lib) override; - bool processPrlFileBase(QString &origFile, const QStringRef &origName, - const QStringRef &fixedBase, int slashOff) override; + bool processPrlFileBase(QString &origFile, QStringView origName, + QStringView fixedBase, int slashOff) override; void processVars(); void fixTargetExt(); |