Hugo Lindström 7645862c7b Merge branch 'master' into resulthintcheck ...

Conflicts:
	src/libtomahawk/utils/TomahawkUtils.cpp

2013-01-21 12:09:18 +01:00

..

accounts

Create hopefully rather sane TomahawkConfig.cmake

2013-01-18 01:15:17 +01:00

breakpad

* Fixed using tLog before Logger is initialized.

2013-01-16 14:37:09 +01:00

infoplugins

Rename add_tomahawk_plugin macro to tomahawk_add_plugin

2013-01-15 20:35:04 +01:00

libtomahawk

Merge branch 'master' into resulthintcheck

2013-01-21 12:09:18 +01:00

mac

Slight clean up by adding a MOUNTAIN_LION define

2013-01-16 08:48:11 -05:00

sourcetree

Add some useful data to the debugging tooltip

2013-01-14 23:23:26 +01:00

web

qt5: port QxtWeb and the web api

2013-01-05 21:54:39 +01:00

widgets

Don't change scroll steps on OSX.

2013-01-17 12:00:51 +01:00

xmppbot

qt5: don't use QWeakPointer to track QObject* anymore

2013-01-05 03:07:44 +01:00

AclRegistryImpl.cpp

* Style and logging clean-ups.

2012-11-09 05:59:22 +01:00

AclRegistryImpl.h

Reorder includes in the app

2012-11-03 02:37:20 +01:00

AudioControls.cpp

Hide the share action from AudioControls if there's no InfoPlugin that

2013-01-16 20:19:03 +01:00

AudioControls.h

Hide the share action from AudioControls if there's no InfoPlugin that

2013-01-16 20:19:03 +01:00

AudioControls.ui

* Tweak AudioControls layout a bit. A lot less margins now.

2013-01-10 05:43:48 +01:00

CMakeLists.linux.cmake

…

CMakeLists.osx.cmake

Slight clean up by adding a MOUNTAIN_LION define

2013-01-16 08:48:11 -05:00

CMakeLists.txt

Fix jumpy scrolling in Account Settings.

2013-01-17 11:46:49 +01:00

CMakeLists.unix.cmake

qt5: port QxtWeb and the web api

2013-01-05 21:54:39 +01:00

CMakeLists.win32.cmake

qt5: port QxtWeb and the web api

2013-01-05 21:54:39 +01:00

Config.h.in

Add CMakeDefine, thanks domme :)

2013-01-16 08:50:03 -05:00

ConfigDelegateBase.cpp

Move implementations to source files in app

2012-11-03 03:24:36 +01:00

ConfigDelegateBase.h

Move implementations to source files in app

2012-11-03 03:24:36 +01:00

DiagnosticsDialog.cpp

Fix updating the DiagnosticsDialog when new peers are set online

2013-01-14 23:23:26 +01:00

DiagnosticsDialog.h

…

DiagnosticsDialog.ui

…

LoadXSPFDialog.cpp

Reorder includes in the app

2012-11-03 02:37:20 +01:00

LoadXSPFDialog.h

…

LoadXSPFDialog.ui

Make auto-updating default in load xspf dialog

2012-09-21 15:43:17 -04:00

main.cpp

Revert "* Disable BreakPad for testing."

2013-01-17 12:36:54 +01:00

ProxyDialog.ui

…

ResolverConfigDelegate.cpp

Reorder includes in the app

2012-11-03 02:37:20 +01:00

ResolverConfigDelegate.h

…

Scrobbler.cpp

Reorder includes in the app

2012-11-03 02:37:20 +01:00

Scrobbler.h

…

SearchBox.ui

Disable translation of some strings in .ui files

2012-12-20 16:25:59 +02:00

Settings_Accounts.ui

Fix jumpy scrolling in Account Settings.

2013-01-17 11:46:49 +01:00

Settings_Advanced.ui

Disable translation of some strings in .ui files

2012-12-20 16:25:59 +02:00

Settings_Collection.ui

Disable translation of some strings in .ui files

2012-12-20 16:25:59 +02:00

SettingsDialog.cpp

qt5: don't use QWeakPointer to track QObject* anymore

2013-01-05 03:07:44 +01:00

SettingsDialog.h

Reorder includes in the app

2012-11-03 02:37:20 +01:00

ShortcutHandler.cpp

…

ShortcutHandler.h

…

SocialWidget.cpp

Remove obsolete Windows hacks.

2013-01-12 21:26:31 +01:00

SocialWidget.h

Move implementations to source files in app

2012-11-03 03:24:36 +01:00

SocialWidget.ui

Disable translation of some strings in .ui files

2012-12-20 16:25:59 +02:00

TomahawkApp.cpp

* Don't compile lastfm parts if liblastfm wasn't found.

2013-01-15 20:35:02 +01:00

TomahawkApp.h

qt5: port QxtWeb and the web api

2013-01-05 21:54:39 +01:00

TomahawkTrayIcon.cpp

* Started using SVGs for a bunch of images instead of good ol' PNG.

2012-12-05 02:18:55 +01:00

TomahawkTrayIcon.h

Reorder includes in the app

2012-11-03 02:37:20 +01:00

TomahawkVersion.h.in

Move TOMAHAWK_SYSTEM to TomahawkVersion.h

2013-01-06 21:18:47 +01:00

TomahawkWindow.cpp

* Restore last fullscreen state on OSX.

2013-01-16 13:18:40 +01:00

TomahawkWindow.h

* Restore last fullscreen state on OSX.

2013-01-16 13:18:40 +01:00

TomahawkWindow.ui

Remove obsolete actions from ui file.

2013-01-04 12:14:43 +01:00

UbuntuUnityHack.cpp

…

UbuntuUnityHack.h

…