Commit 85327a45 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

remove trailing dots from some error messages



the i/o functions are not very consistent about having the dot already
in the message. the windows api does, and qt passes this on.

Change-Id: I2d1a213965e15478985d6eff205689ea44aa2a03
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/4334ddc76bdcf1e6d379faae562bc5916c50c4ba)
parent db2a8aa3
...@@ -359,7 +359,7 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open ...@@ -359,7 +359,7 @@ QMakeEvaluator::writeFile(const QString &ctx, const QString &fn, QIODevice::Open
{ {
QString errStr; QString errStr;
if (!m_vfs->writeFile(fn, mode, contents, &errStr)) { if (!m_vfs->writeFile(fn, mode, contents, &errStr)) {
evalError(fL1S("Cannot write %1file %2: %3.") evalError(fL1S("Cannot write %1file %2: %3")
.arg(ctx, QDir::toNativeSeparators(fn), errStr)); .arg(ctx, QDir::toNativeSeparators(fn), errStr));
return ReturnFalse; return ReturnFalse;
} }
...@@ -1583,7 +1583,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( ...@@ -1583,7 +1583,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
GENERIC_READ, FILE_SHARE_READ, GENERIC_READ, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (rHand == INVALID_HANDLE_VALUE) { if (rHand == INVALID_HANDLE_VALUE) {
evalError(fL1S("Cannot open() reference file %1: %2.").arg(rfn, windowsErrorCode())); evalError(fL1S("Cannot open() reference file %1: %2").arg(rfn, windowsErrorCode()));
return ReturnFalse; return ReturnFalse;
} }
FILETIME ft; FILETIME ft;
...@@ -1593,7 +1593,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( ...@@ -1593,7 +1593,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
GENERIC_WRITE, FILE_SHARE_READ, GENERIC_WRITE, FILE_SHARE_READ,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (wHand == INVALID_HANDLE_VALUE) { if (wHand == INVALID_HANDLE_VALUE) {
evalError(fL1S("Cannot open() %1: %2.").arg(tfn, windowsErrorCode())); evalError(fL1S("Cannot open() %1: %2").arg(tfn, windowsErrorCode()));
return ReturnFalse; return ReturnFalse;
} }
SetFileTime(wHand, 0, 0, &ft); SetFileTime(wHand, 0, 0, &ft);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment