Christian Muehlhaeuser
71a3f223c2
* Merged master into branch phonon.
2011-04-15 11:06:26 +02:00
Leo Franchi
3ce41c50bc
Don't assert if a scrobble failed, that's no fun.
2011-04-14 10:42:16 -04:00
Jeff Mitchell
3b873dfeda
Limit policy setting to 2.8.4 or higher
2011-04-12 11:00:07 -04:00
Jeff Mitchell
0d6c335e45
Suppress warning with newer cmake
2011-04-12 10:53:32 -04:00
Leo Franchi
79542e60e6
Merge branch 'stable'
...
Conflicts:
CMakeLists.txt
2011-04-11 15:40:07 -04:00
Leo Franchi
24d9cce3a8
Install a .protocol file on KDE so tomahawk:// links work there too
2011-04-11 15:36:29 -04:00
Frank Osterfeld
b6d6969281
pass parent to messageboxes
2011-03-30 19:11:32 +02:00
Dominik Schmidt
f52205d2cc
Update jreen plugin to newer jreen and sip plugin interface
2011-03-30 05:05:22 +02:00
Leo Franchi
ecd8b302c4
build liblastfm2 statically on non-win32, and don't build fingerprinter.
...
got multiple reports of tomahawk not finding liblastfm2 due to rpath or other issues, and we are building our o ther 3rdparty deps statically like this.
2011-03-27 22:06:55 -04:00
Leo Franchi
1697b27aca
fix compile on osx
...
don't use API that doesn't exist in snow leopard---same code is in liblastfmv1. if jono wants to rewrite the path detection code in snow leopard-compatible APIs, we can use that
2011-03-26 18:29:35 -04:00
Jeff Mitchell
3182df93dd
Don't install liblastfm2 headers
2011-03-26 12:25:35 -04:00
Christian Muehlhaeuser
74ea476ad6
Merge remote-tracking branch 'origin/stable'
2011-03-26 02:40:12 +01:00
Leo Franchi
631c39163d
don't install a static lib
2011-03-25 17:45:32 -04:00
Jeff Mitchell
6b1bb4da61
Merge remote branch 'origin/master' into liblastfm2
2011-03-25 09:40:56 -04:00
Leo Franchi
a080323e2e
switch to using KDSingleApplicationGuard instead of QtUniqueApp as it's broken on windows.
...
KDSingleApplicationGuard is from KDTools and this is the GPL-licensed version.
Conflicts:
src/main.cpp
2011-04-03 00:14:24 -04:00
Jeff Mitchell
b7a1cb8d99
Add liblastfm2 and make tomahawk build against it
2011-03-24 19:27:01 -04:00
Jeff Mitchell
1780781e12
Fix qtweetlib qjson linking too
2011-03-24 19:06:36 -04:00
Guillermo A. Amaral
32d82159d9
Fix to allow building with dependencies that are outside the usual system locations.
2011-03-25 05:15:14 +08:00
Guillermo A. Amaral
c23422ff8e
More build fixes
2011-03-25 10:02:01 +08:00
Jeff Mitchell
6d92d158bb
Have proper visibility of the libraries instead of assuming it's only needed on WIN32
2011-03-24 15:55:02 -04:00
Jeff Mitchell
1211bf23b6
Revamp twitter auth mechanism, which will hopefully remove false-positive auth success and allow de-authing
2011-03-22 14:37:06 -04:00
Jeff Mitchell
c15c99cfa9
Sync with upstream qtweetlib
2011-03-22 10:12:46 -04:00
Christian Muehlhaeuser
e1c687640e
* Did not plan to commit that.
2011-03-21 12:58:50 +01:00
Christian Muehlhaeuser
8e42c8964b
* Fixed JavaScript errors causing a Pipeline assert.
2011-03-21 12:49:53 +01:00
Dominik Schmidt
4e4d304b01
Respect 64 when installing libraries
2011-03-20 19:53:27 +01:00
Christian Muehlhaeuser
eea1a5e0b6
* Final CMakeLists.txt fixes?
2011-03-20 03:54:45 +01:00
Christian Muehlhaeuser
e109415add
* Fixed rtaudio install.
2011-03-20 03:50:19 +01:00
Christian Muehlhaeuser
fe518a5cbb
* Fixed cmake install targets.
2011-03-20 03:48:07 +01:00
Christian Muehlhaeuser
a18c0eed7a
* Fixed GPL headers.
2011-03-18 21:33:20 +01:00
Leo Franchi
69e9cda5e6
fix some cmake stuff. add uninstall support
...
change plugin names, load changed names, don't install static libs, etc
2011-03-18 14:46:30 -04:00
Christian Muehlhaeuser
4c46055e88
* Fixed phonon branch.
2011-03-04 08:48:12 +01:00
Dominik Schmidt
ac066e53f6
Updated jreen revision to fix linking sip_jreen on windows
2011-03-02 15:18:42 +01:00
Dominik Schmidt
528918831e
Implement adding friends in sip_jreen
2011-03-02 03:23:59 +01:00
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
