diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2017-04-07 22:31:59 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-04-08 05:40:52 +0000 |
| commit | de3785b8bc4eeec403835840b0328b5256854ea4 (patch) | |
| tree | ba680f1110a03f9319137dbc0035556b4b711407 /qmake/library | |
| parent | f5d8ad61a4c85a656a7332c43d0c42f5eaf43593 (diff) | |
QVersionNumber: add fromString(QStringView/QLatin1String) overloads
The parsing code anyway operated on a QByteArray created from
toLatin1(), so expose this to the user by providing a QLatin1String
overload.
Also provide a QStringView overload, since we can. Port one user (in
qmake) to the new overload.
[ChangeLog][QtCore][QVersionNumber] Added QStringView and
QLatin1String overloads of fromString().
Change-Id: Idbff44c3997f5cfa86ea1bce8b3da4b700a3d9cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake/library')
| -rw-r--r-- | qmake/library/qmakebuiltins.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/library/qmakebuiltins.cpp b/qmake/library/qmakebuiltins.cpp index d517aa5a84..b86efa33b4 100644 --- a/qmake/library/qmakebuiltins.cpp +++ b/qmake/library/qmakebuiltins.cpp @@ -1569,7 +1569,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( return ReturnFalse; } const QVersionNumber lvn = QVersionNumber::fromString(values(args.at(0).toKey()).join('.')); - const QVersionNumber rvn = QVersionNumber::fromString(args.at(1).toQString()); + const QVersionNumber rvn = QVersionNumber::fromString(args.at(1).toQStringView()); if (func_t == T_VERSION_AT_LEAST) return returnBool(lvn >= rvn); return returnBool(lvn <= rvn); |