From afa04e9e661c49b301469ae1254d504de41b020a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 13 Aug 2013 10:59:15 +0000 Subject: [PATCH] Only prefix JREEN logging with Qt4 --- src/accounts/xmpp/sip/XmppSip.cpp | 4 ++++ src/libtomahawk/infosystem/InfoSystem.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp index 71f5b9052..c85415efb 100644 --- a/src/accounts/xmpp/sip/XmppSip.cpp +++ b/src/accounts/xmpp/sip/XmppSip.cpp @@ -72,6 +72,7 @@ using namespace Accounts; #define TOMAHAWK_CAP_NODE_NAME QLatin1String( "http://tomahawk-player.org/" ) +#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 ) void JreenMessageHandler( QtMsgType type, const char *msg ) { @@ -91,6 +92,7 @@ JreenMessageHandler( QtMsgType type, const char *msg ) abort(); } } +#endif XmppSipPlugin::XmppSipPlugin( Account* account ) @@ -102,7 +104,9 @@ XmppSipPlugin::XmppSipPlugin( Account* account ) , m_pubSubManager( 0 ) #endif { +#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 ) Jreen::Logger::addHandler( JreenMessageHandler ); +#endif m_currentUsername = readUsername(); m_currentServer = readServer(); diff --git a/src/libtomahawk/infosystem/InfoSystem.cpp b/src/libtomahawk/infosystem/InfoSystem.cpp index f0f2baa1b..1d7a12229 100644 --- a/src/libtomahawk/infosystem/InfoSystem.cpp +++ b/src/libtomahawk/infosystem/InfoSystem.cpp @@ -150,12 +150,13 @@ InfoSystem::~InfoSystem() void InfoSystem::init() { - tDebug() << Q_FUNC_INFO; + // tDebug() << Q_FUNC_INFO; if ( m_inited ) return; if ( !m_infoSystemCacheThreadController->cache() || !m_infoSystemWorkerThreadController->worker() ) { + // tLog() << "Worker not found"; QTimer::singleShot( 0, this, SLOT( init() ) ); return; }