diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py index 17dc312e3..3a2ffffd8 100755 --- a/admin/mac/macdeploy.py +++ b/admin/mac/macdeploy.py @@ -206,7 +206,7 @@ TOMAHAWK_PLUGINS = [ ] QT_PLUGINS_SEARCH_PATH=[ - '/usr/local/Cellar/qt/4.8.0/plugins', + '/usr/local/Cellar/qt/4.7.4/plugins', ] diff --git a/src/accounts/spotify/SpotifyAccount.cpp b/src/accounts/spotify/SpotifyAccount.cpp index 866cbc309..c3e4106f5 100644 --- a/src/accounts/spotify/SpotifyAccount.cpp +++ b/src/accounts/spotify/SpotifyAccount.cpp @@ -585,9 +585,6 @@ SpotifyAccount::icon() const QWidget* SpotifyAccount::configurationWidget() { - if ( m_spotifyResolver.isNull() ) - return 0; - if ( m_configWidget.isNull() ) { m_configWidget = QWeakPointer< SpotifyAccountConfig >( new SpotifyAccountConfig( this ) ); diff --git a/src/libtomahawk/AtticaManager.cpp b/src/libtomahawk/AtticaManager.cpp index 265dec190..9ae1d27cf 100644 --- a/src/libtomahawk/AtticaManager.cpp +++ b/src/libtomahawk/AtticaManager.cpp @@ -200,14 +200,12 @@ AtticaManager::resolvers() const Content AtticaManager::resolverForId( const QString& id ) const { - qDebug() << "Asked for resolver for id:" << id; foreach ( const Attica::Content& c, m_resolvers ) { if ( c.id() == id ) return c; } - qDebug() << "Not found!"; return Content(); } @@ -216,10 +214,6 @@ AtticaManager::resolverForId( const QString& id ) const AtticaManager::ResolverState AtticaManager::resolverState ( const Content& resolver ) const { - qDebug() << Q_FUNC_INFO << "Returning resolver state for resolver:" << resolver .id() << "known?" << m_resolverStates.contains( resolver.id() ); - if ( m_resolverStates.contains( resolver.id() ) ) - qDebug() << "KNOWN and stateL" << m_resolverStates[ resolver.id() ].state; - if ( !m_resolverStates.contains( resolver.id() ) ) { return AtticaManager::Uninstalled; diff --git a/src/libtomahawk/mac/FileHelpers.mm b/src/libtomahawk/mac/FileHelpers.mm index a53d1690d..97ee3c4ed 100644 --- a/src/libtomahawk/mac/FileHelpers.mm +++ b/src/libtomahawk/mac/FileHelpers.mm @@ -76,6 +76,8 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza + (void) moveFile:(NSString *)source to:(NSString*)dest withDelegate:delegate { + NSLog(@"FileHelpers moving file from %@ to %@", source, dest); + NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:source, TKCopySourceKey, dest, TKCopyDestinationKey, delegate, TKInstallerDelegateKey, nil]; [NSThread detachNewThreadSelector:@selector(performMoveWithInfo:) toTarget:self withObject:info]; } diff --git a/src/libtomahawk/utils/TomahawkUtils_Mac.mm b/src/libtomahawk/utils/TomahawkUtils_Mac.mm index 346a4d662..fc5c3d08c 100644 --- a/src/libtomahawk/utils/TomahawkUtils_Mac.mm +++ b/src/libtomahawk/utils/TomahawkUtils_Mac.mm @@ -58,8 +58,6 @@ NSLog( @"Failed to do chmod +x of moved resolver! %@", [[error userInfo] objectForKey: NSLocalizedDescriptionKey] ); } - qDebug() << "Successfully install tomahawk resolver with path:" << path; - if ( receiver ) QMetaObject::invokeMethod(receiver, "installSucceeded", Qt::DirectConnection, Q_ARG(QString, path)); diff --git a/src/main.cpp b/src/main.cpp index 717fa6cd7..2c786bf55 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -147,7 +147,7 @@ main( int argc, char *argv[] ) #ifndef ENABLE_HEADLESSs #ifdef WITH_BREAKPAD - //new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() ); + new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() ); #endif #endif