summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-02-07 14:05:06 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2013-02-07 16:42:41 +0100
commitb32aa577b9647a79537e9218748c9987d2129728 (patch)
treed21f5760af17ede82f1057c7e0f6bf45e1e765e8 /src/libs/installer
parent67124a7d28ef2d3723cb01a21d3618c9df4cb446 (diff)
Improve and unify the error messages.
Change-Id: I13d3c17625b11a001816b17bc139ac273af53263 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer')
-rw-r--r--src/libs/installer/setdemospathonqtoperation.cpp2
-rw-r--r--src/libs/installer/setexamplespathonqtoperation.cpp2
-rw-r--r--src/libs/installer/setimportspathonqtcoreoperation.cpp4
-rw-r--r--src/libs/installer/setpluginpathonqtcoreoperation.cpp4
4 files changed, 8 insertions, 4 deletions
diff --git a/src/libs/installer/setdemospathonqtoperation.cpp b/src/libs/installer/setdemospathonqtoperation.cpp
index f1878fdb5..a997b29ba 100644
--- a/src/libs/installer/setdemospathonqtoperation.cpp
+++ b/src/libs/installer/setdemospathonqtoperation.cpp
@@ -96,7 +96,7 @@ bool SetDemosPathOnQtOperation::performOperation()
if (newValue.size() >= 255) {
setError(UserDefinedError);
- setErrorString(tr("Qt patch error: new Qt demo path (%1)\nneeds to be less than 255 characters.")
+ setErrorString(tr("Qt patch error: new Qt demo path '%1'\nneeds to be less than 255 characters.")
.arg(QString::fromLocal8Bit(newValue)) );
return false;
}
diff --git a/src/libs/installer/setexamplespathonqtoperation.cpp b/src/libs/installer/setexamplespathonqtoperation.cpp
index bebdf531f..e28443d43 100644
--- a/src/libs/installer/setexamplespathonqtoperation.cpp
+++ b/src/libs/installer/setexamplespathonqtoperation.cpp
@@ -96,7 +96,7 @@ bool SetExamplesPathOnQtOperation::performOperation()
if (newValue.size() >= 255) {
setError(UserDefinedError);
- setErrorString(tr("Qt patch error: new Qt example path (%1)\nneeds to be less than 255 characters.")
+ setErrorString(tr("Qt patch error: new Qt example path '%1'\nneeds to be less than 255 characters.")
.arg(QString::fromLocal8Bit(newValue)));
return false;
}
diff --git a/src/libs/installer/setimportspathonqtcoreoperation.cpp b/src/libs/installer/setimportspathonqtcoreoperation.cpp
index a937da9a9..84b863aa1 100644
--- a/src/libs/installer/setimportspathonqtcoreoperation.cpp
+++ b/src/libs/installer/setimportspathonqtcoreoperation.cpp
@@ -116,7 +116,9 @@ bool SetImportsPathOnQtCoreOperation::performOperation()
const QByteArray newValue = QDir::toNativeSeparators(args.at(1)).toUtf8();
if (newValue.size() >= 255) {
- qDebug() << "qpatch: error: newQtDir needs to be less than 255 characters.";
+ setError(UserDefinedError);
+ setErrorString(tr("Qt patch error: new Qt imports path '%1'\nneeds to be less than 255 characters.")
+ .arg(QString::fromLocal8Bit(newValue)));
return false;
}
QStringList libraryFiles;
diff --git a/src/libs/installer/setpluginpathonqtcoreoperation.cpp b/src/libs/installer/setpluginpathonqtcoreoperation.cpp
index eebf0f4ab..ac681626e 100644
--- a/src/libs/installer/setpluginpathonqtcoreoperation.cpp
+++ b/src/libs/installer/setpluginpathonqtcoreoperation.cpp
@@ -115,7 +115,9 @@ bool SetPluginPathOnQtCoreOperation::performOperation()
const QByteArray newValue = QDir::toNativeSeparators(args.at(1)).toUtf8();
if (newValue.size() >= 255) {
- qDebug() << "qpatch: error: newQtDir needs to be less than 255 characters.";
+ setError(UserDefinedError);
+ setErrorString(tr("Qt patch error: new Qt plugin path '%1'\nneeds to be less than 255 characters.")
+ .arg(QString::fromLocal8Bit(newValue)));
return false;
}
QStringList libraryFiles;