summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortjenssen <tim.jenssen@digia.com>2012-09-27 18:20:17 +0200
committerTim Jenssen <tim.jenssen@digia.com>2012-10-01 11:46:33 +0200
commitc266f5bdd600c07924e4b2ceca45c4ce2aae3ff2 (patch)
treea212ca411094f4730a9d8bc13040c5bcdd5e9bd9 /src
parent51767479dedc892bc09324ec4ea83500744091d2 (diff)
no matter which verbose mode - warnings should be shown
- and creation of the exception shouldn't write the warning - this should be happen in the catch block Change-Id: I574c77fab42845079bda7c0d57c4a4a0bdbe1e7f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/errors.h2
-rw-r--r--src/libs/installer/init.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/installer/errors.h b/src/libs/installer/errors.h
index 09ad52b14..0be604db8 100644
--- a/src/libs/installer/errors.h
+++ b/src/libs/installer/errors.h
@@ -45,7 +45,7 @@ class Error : public std::runtime_error
public:
explicit Error(const QString &message)
: std::runtime_error(message.toStdString())
- , m_message (message) { qWarning() << "Error-Exception:" << message; }
+ , m_message (message) { qDebug() << "Error-Exception:" << message; }
virtual ~Error() throw() {}
QString message() const { return m_message; }
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index ee5c03146..cb700ccee 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -84,6 +84,8 @@
#include <unix/C/7zCrc.h>
+#include <iostream>
+
namespace NArchive {
namespace NBz2 { void registerArcBZip2(); }
namespace NGz { void registerArcGZip(); }
@@ -180,6 +182,9 @@ static void messageHandler(QtMsgType type, const char *msg)
}
verbose() << ba.constData() << std::endl;
+ if (!isVerbose() && type != QtDebugMsg)
+ std::cout << ba.constData() << std::endl << std::endl;
+
if (type == QtFatalMsg) {
QtMsgHandler oldMsgHandler = qInstallMsgHandler(0);
qt_message_output(type, msg);