From 4d60e9e7aabeaa0b980062c5cda3efded996f551018a7b8c16f0c0a4be02681d Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Wed, 18 Dec 2013 21:03:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=7

---
 noqDebug-qWarnings.patch | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/noqDebug-qWarnings.patch b/noqDebug-qWarnings.patch
index d92bdbb..8ef4018 100644
--- a/noqDebug-qWarnings.patch
+++ b/noqDebug-qWarnings.patch
@@ -35,7 +35,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuexporter.cpp lib
      QVariantMap map = propertiesForAction(action);
 diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp
 --- libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp	2013-12-09 03:29:47.000000000 +0100
-+++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp	2013-12-18 22:02:02.663658752 +0100
++++ libdbusmenu-qt-0.9.2+14.04.20131209/src/dbusmenuimporter.cpp	2013-12-18 22:06:44.057140849 +0100
 @@ -191,7 +191,9 @@
              updateActionShortcut(action, value);
          } else if (key == "children-display") {
@@ -46,7 +46,17 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          }
      }
  
-@@ -390,7 +392,9 @@
+@@ -239,7 +241,9 @@
+         action->setProperty(DBUSMENU_PROPERTY_ICON_DATA_HASH, dataHash);
+         QPixmap pix;
+         if (!pix.loadFromData(data)) {
++#ifndef QT_NO_DEBUG
+             DMWARNING << "Failed to decode icon-data property for action" << action->text();
++#endif
+             action->setIcon(QIcon());
+             return;
+         }
+@@ -390,7 +394,9 @@
  
      QDBusPendingReply<uint, DBusMenuLayoutItem> reply = *watcher;
      if (!reply.isValid()) {
@@ -56,7 +66,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          return;
      }
  
-@@ -401,7 +405,9 @@
+@@ -401,7 +407,9 @@
  
      QMenu *menu = d->menuForId(parentId);
      if (!menu) {
@@ -66,7 +76,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          return;
      }
  
-@@ -494,7 +500,9 @@
+@@ -494,7 +502,9 @@
      QPointer<QObject> guard(this);
  
      if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) {
@@ -76,7 +86,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
      }
  
      #ifdef BENCHMARK
-@@ -522,7 +530,9 @@
+@@ -522,7 +532,9 @@
  
      QDBusPendingReply<bool> reply = *watcher;
      if (reply.isError()) {
@@ -86,7 +96,7 @@ diff -Naur libdbusmenu-qt-0.9.2+14.04.20131209.orig/src/dbusmenuimporter.cpp lib
          return;
      }
      bool needRefresh = reply.argumentAt<0>();
-@@ -534,7 +544,9 @@
+@@ -534,7 +546,9 @@
          d->m_idsRefreshedByAboutToShow << id;
          watcher = d->refresh(id);
          if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) {