Merge tag 'upstream/3.0.5'

Upstream version 3.0.5

# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 8 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp b/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp
index 00aaac4..a2ce9f8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp
@@ -12,6 +12,8 @@ bool UI_DEBUG_ENABLED = false;
 bool UI_DEBUG_CONSOLE = true;
 QString UI_DEBUG_FILE;
 
+QStringList MsgHandlerThreadProxy::ignoredWarnings;
+
 void uiMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     if (!UI_DEBUG_ENABLED)
@@ -100,6 +102,9 @@ MsgHandlerThreadProxy::~MsgHandlerThreadProxy()
 
 void MsgHandlerThreadProxy::init()
 {
+    ignoredWarnings << QStringLiteral("libpng warning: Unknown iTXt compression type or method");
+    ignoredWarnings << QStringLiteral("QPainter::font: Painter not active");
+
     if (sqliteStudioUiDebugConsole)
     {
         connect(this, SIGNAL(debugRequested(QString)), sqliteStudioUiDebugConsole, SLOT(debug(QString)));
@@ -139,6 +144,9 @@ void MsgHandlerThreadProxy::debug(const QString &msg)
 
 void MsgHandlerThreadProxy::warn(const QString &msg)
 {
+    if (ignoredWarnings.contains(msg.mid(25)))
+        return;
+
     emit warnRequested(msg);
 }