diff -Naur libdbusmenu-qt-0.9.2.orig/CMakeLists.txt libdbusmenu-qt-0.9.2/CMakeLists.txt --- libdbusmenu-qt-0.9.2.orig/CMakeLists.txt 2012-03-29 17:47:52.000000000 +0200 +++ libdbusmenu-qt-0.9.2/CMakeLists.txt 2013-08-25 22:31:17.238891142 +0200 @@ -88,7 +88,7 @@ add_subdirectory(src) if (NOT USE_QT5) # TODO port tests to Qt5 -add_subdirectory(tests) +#add_subdirectory(tests) endif() add_subdirectory(tools) diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp --- libdbusmenu-qt-0.9.2.orig/src/dbusmenuexporter.cpp 2012-03-29 17:47:52.000000000 +0200 +++ libdbusmenu-qt-0.9.2/src/dbusmenuexporter.cpp 2013-08-25 21:53:59.005872906 +0200 @@ -160,7 +160,9 @@ Q_FOREACH(QAction *action, menu->actions()) { int actionId = m_idForAction.value(action, -1); if (actionId == -1) { +#ifndef QT_NO_DEBUG DMWARNING << "No id for action"; +#endif continue; } @@ -185,7 +187,9 @@ { int id = m_idForAction.value(action, -1); if (id != -1) { +#ifndef QT_NO_DEBUG DMWARNING << "Already tracking action" << action->text() << "under id" << id; +#endif return; } QVariantMap map = propertiesForAction(action); diff -Naur libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp --- libdbusmenu-qt-0.9.2.orig/src/dbusmenuimporter.cpp 2012-03-29 17:47:52.000000000 +0200 +++ libdbusmenu-qt-0.9.2/src/dbusmenuimporter.cpp 2013-08-25 21:53:10.844475006 +0200 @@ -190,7 +190,9 @@ } else if (key == "shortcut") { updateActionShortcut(action, value); } else { +#ifndef QT_NO_DEBUG DMWARNING << "Unhandled property update" << key; +#endif } } @@ -238,7 +240,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 reply = *watcher; if (!reply.isValid()) { +#ifndef QT_NO_DEBUG DMWARNING << reply.error().message(); +#endif return; } @@ -401,7 +407,9 @@ QMenu *menu = d->menuForId(parentId); if (!menu) { +#ifndef QT_NO_DEBUG DMWARNING << "No menu for id" << parentId; +#endif return; } @@ -489,7 +497,9 @@ QPointer guard(this); if (!waitForWatcher(watcher, ABOUT_TO_SHOW_TIMEOUT)) { +#ifndef QT_NO_DEBUG DMWARNING << "Application did not answer to AboutToShow() before timeout"; +#endif } #ifdef BENCHMARK @@ -517,7 +527,9 @@ QDBusPendingReply reply = *watcher; if (reply.isError()) { +#ifndef QT_NO_DEBUG DMWARNING << "Call to AboutToShow() failed:" << reply.error().message(); +#endif return; } bool needRefresh = reply.argumentAt<0>(); @@ -529,7 +541,9 @@ d->m_idsRefreshedByAboutToShow << id; watcher = d->refresh(id); if (!waitForWatcher(watcher, REFRESH_TIMEOUT)) { +#ifndef QT_NO_DEBUG DMWARNING << "Application did not refresh before timeout"; +#endif } } } diff -Naur libdbusmenu-qt-0.9.2.orig/src/debug_p.h libdbusmenu-qt-0.9.2/src/debug_p.h --- libdbusmenu-qt-0.9.2.orig/src/debug_p.h 2012-03-29 17:47:52.000000000 +0200 +++ libdbusmenu-qt-0.9.2/src/debug_p.h 2013-08-25 22:28:20.231104044 +0200 @@ -36,12 +36,10 @@ #define DMVAR(var) DMDEBUG << #var ":" << var #define DMRETURN_IF_FAIL(cond) if (!(cond)) { \ - DMWARNING << "Condition failed: " #cond; \ return; \ } #define DMRETURN_VALUE_IF_FAIL(cond, value) if (!(cond)) { \ - DMWARNING << "Condition failed: " #cond; \ return (value); \ }