1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-25 12:23:36 +01:00

24 Commits

Author SHA1 Message Date
Christian Muehlhaeuser
fd70ca0a1b Merge remote branch 'origin' into phonon 2011-02-28 01:45:00 +01:00
Dominik Schmidt
f09a101db2 Add jreen submodule 2011-02-28 00:47:06 +01:00
Christian Muehlhaeuser
c50f0626db * Getting rid of old & obsolete audioengine / transcoder stuff. 2011-02-23 19:05:04 +01:00
Dominik Schmidt
8fb19bf84d Move rtaudio, alsa-playback and qxt into thirdparty/. 2011-02-21 15:25:43 +01:00
Jeff Mitchell
9059dd4782 Remove unused qtweetlib_export.h, move our custom tomahawkoauthtwitter
to the tomahawk_qtweetlib library where it belongs.

Probably broke Windows again. Sorry domme  :-)
2011-02-16 07:44:49 -05:00
Leo Franchi
8d91fb6f99 i don't know why my Qt no longer works with module-wide includes... but they are bad anyway. Include what we need. 2011-02-15 18:17:33 -05:00
Dominik Schmidt
053fa4220c Fix cross compiling/linking once again: today's episode: scanmanager and sip_twitter. 2011-02-15 05:51:24 +01:00
Jeff Mitchell
d858c3fae8 Clean up qtweetlib a bit, and put API keys back...can change them at some point if it becomes a problem 2011-02-14 14:29:37 -05:00
Jeff Mitchell
9ef55b5fa1 Merge remote branch 'origin/master' into tweetsip
Conflicts:
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/tomahawksettings.cpp
2011-02-14 13:43:58 -05:00
Jeff Mitchell
697d69a54f Display warning if twitter consumer key/secret file not found, letting users know it will not be available 2011-02-14 13:40:52 -05:00
Jeff Mitchell
a5895da883 Only include twitter key file if it actually exists 2011-02-14 13:38:50 -05:00
Christian Muehlhaeuser
496a09dc81 * Unbreak windows compile. 2011-02-14 17:49:28 +01:00
Christian Muehlhaeuser
7a081128e6 * Make it compile again for Win32. 2011-02-14 17:29:23 +01:00
Jeff Mitchell
202e43668c Cmake will now source a file with the necessary property definitions 2011-02-13 13:51:45 -05:00
Jeff Mitchell
98bd3d226c Remove twitter api keys from oauth.cpp, they've been regenerated 2011-02-13 13:39:22 -05:00
Jeff Mitchell
29d096be15 Fix misnamed signals and stupidity in qtweetnetbase 2011-02-12 20:15:54 -05:00
Jeff Mitchell
1ef02210d6 Add our swanky new Twitter OAuth credentials 2011-02-11 19:22:29 -05:00
Jeff Mitchell
a190db23f8 Merge branch 'master' into tweetsip 2011-02-11 17:51:30 -05:00
Leo Franchi
82c5aece40 make compile on osx. don't ask.
break lib dependency on gui

minor UI tweaks
2011-02-11 16:29:35 -05:00
Jeff Mitchell
b5b1ad16ff lowercase the dirname 2011-02-11 15:39:55 -05:00
Jeff Mitchell
4fafb4c7c3 Import QTweetLib and add CMakeLists and export files. 2011-02-11 15:36:44 -05:00
Jeff Mitchell
d18236afb4 Add forgotten file 2011-02-10 14:01:47 -05:00
Jeff Mitchell
2d11571812 Integrate qjdns/jdnsshared, make a shared library, and do some implementation 2011-02-10 13:03:35 -05:00
Jeff Mitchell
c9aec3d55e It's good to be back. Add jdns and make libtomahawk link to it, so that we can do proper SRV resolving. Also create thirdparty/ which portfwd and others should really be moved in to 2011-01-27 00:05:16 -05:00