diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-04 16:11:41 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-04 16:15:55 +0000 |
commit | aeb3f9d168580efb8ab2df4003c53cbe8045ed80 (patch) | |
tree | 7f98aec853b447f078083fe1fca2d49f2c66a04a /src/corelib/tools/qregularexpression.cpp | |
parent | 5eb74ad4f59cb3ce212c3673005b512fdecd7ec1 (diff) | |
parent | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qregularexpression.cpp')
-rw-r--r-- | src/corelib/tools/qregularexpression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index bbdf7db7f9..8177f4ead2 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -1674,7 +1674,7 @@ QString QRegularExpression::errorString() const } while (errorStringLength < 0); errorString.resize(errorStringLength); - return QCoreApplication::translate("QRegularExpression", errorString.toLatin1().constData()); + return QCoreApplication::translate("QRegularExpression", std::move(errorString).toLatin1().constData()); } return QCoreApplication::translate("QRegularExpression", "no error"); } |