Jeff Mitchell
65c8739da5
Merge branch 'master' into infoplugins and fix up problematic bits. This
...
fully separates out all infoplugins into separate buildable units.
Eventually I'll make cmake switches to enable easy picking of the
different plugins at build-time; distros will like that.
Conflicts:
src/infoplugins/generic/CMakeLists.txt
src/infoplugins/generic/ChartsPlugin.cpp
src/infoplugins/generic/ChartsPlugin.h
src/infoplugins/generic/ChartsPlugin_Data_p.h
src/infoplugins/generic/charts/ChartsPlugin.cpp
src/infoplugins/generic/charts/ChartsPlugin.h
src/infoplugins/generic/hypem/HypemPlugin.cpp
src/infoplugins/generic/hypem/HypemPlugin.h
src/infoplugins/generic/hypemPlugin.cpp
src/infoplugins/generic/hypemPlugin.h
src/libtomahawk/CMakeLists.txt
src/libtomahawk/CountryUtils.h
src/libtomahawk/infosystem/InfoSystemWorker.cpp
src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.cpp
src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin.h
src/libtomahawk/infosystem/infoplugins/generic/ChartsPlugin_Data_p.h
src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp
src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h
2012-05-18 00:47:32 -04:00
Dominik Schmidt
f9eab019a9
cmake *sigh*
2012-05-17 18:37:34 +02:00
Dominik Schmidt
f33d446f7f
Make linux infoplugins real plugins
2012-05-14 05:17:07 +02:00
Dominik Schmidt
9c995270cf
minor improvements for add_tomahawk_plugin
2012-05-14 04:16:58 +02:00
Dominik Schmidt
dd4acb0cd2
add_tomahawk_plugin: port googlewrapper account
2012-05-14 03:24:10 +02:00
Dominik Schmidt
102ead74bd
Add add_tomahawk_plugin cmake macro
2012-05-14 02:41:02 +02:00
Dominik Schmidt
c7ecacda32
FindQCA2: OSX: Add additional search path for qca from brew
2012-04-30 23:04:53 +02:00
Dominik Schmidt
a27d918bea
Make my warning actually readable ...
2012-03-15 02:12:35 +01:00
Dominik Schmidt
8503f5bbe3
Some more cleanup in FindJreen.cmake
2012-03-15 02:11:19 +01:00
Dominik Schmidt
b2779a9b6a
Cleanup FindJreen.cmake and make it version aware
2012-03-15 01:24:35 +01:00
Dominik Schmidt
d0a6d8a0a2
Fix windows installer
2012-02-12 22:48:37 +01:00
Dominik Schmidt
99143f6148
Fix windows for qt 4.8
2012-02-12 20:23:20 +01:00
Dominik Schmidt
4a1b021753
Fix FindTaglib.cmake for windows
2012-02-10 19:33:48 +01:00
Christian Muehlhaeuser
633dddf281
* Fixed tomahawk:// protocol handler on Windows (Firefox related).
2011-12-02 13:19:02 +01:00
Dominik Schmidt
7984d38628
Remove now unneeded files from windows installer
2011-11-29 03:08:45 +01:00
Christian Muehlhaeuser
f3f1c2d814
* Forgot to rename crash reporter in one more place.
2011-11-23 10:22:13 +01:00
Christian Muehlhaeuser
e63eef8faf
* Updated new crash reporter binary name in release scripts.
2011-11-23 10:12:09 +01:00
Dominik Schmidt
6172ef3df4
* Merged FindCLucene fix.
2011-11-23 06:39:38 +01:00
Dominik Schmidt
2be3ebd90b
* Merged CrashReporter changes into master.
2011-11-23 06:14:26 +01:00
Dominik Schmidt
f1200ac74d
Find patched CLucene from Packman
2011-10-30 16:56:10 +01:00
Leo Franchi
03f0870f53
Update FindPhonon.cmake from KDE
2011-10-18 16:20:44 -04:00
Dominik Schmidt
f54dee3ccc
Fix windows installer
2011-10-04 02:06:16 +02:00
Christian Muehlhaeuser
c6c91181ab
* Added CrashReporter.exe to NSIS template.
2011-09-24 10:31:48 +02:00
Christian Muehlhaeuser
d8b07cee9c
* Fixed libquazip.dll still missing.
2011-09-15 05:44:44 +02:00
Christian Muehlhaeuser
729c9237fe
* Added libattica.dll, too.
2011-09-15 05:27:09 +02:00
Christian Muehlhaeuser
b2fc9cb8ac
* Fix Windows installers missing libquazip.dll.
2011-09-15 05:21:20 +02:00
Christian Muehlhaeuser
3bf2fa1237
* Fixed not finding / using local libquazip.
2011-09-12 10:56:39 +02:00
Leo Franchi
158bbff8de
add quazip and some code to unpack
2011-09-11 17:18:22 -04:00
Leo Franchi
3f457d4a00
Add a view for libattica-provided GHNS resolvers
2011-09-11 17:17:56 -04:00
Leo Franchi
65709e92ff
Add file
2011-08-29 11:27:50 -04:00
Dominik Schmidt
977757cc7e
TWK-410: possible fix
2011-08-21 03:23:29 +02:00
Dominik Schmidt
e7aa846a0f
Remove all references to installer revision
2011-08-14 14:29:55 +02:00
Dominik Schmidt
7d8e29a932
Removed revision.txt. No warranty, I'm drnuk
2011-08-14 02:47:45 +02:00
Dominik Schmidt
e6bb2877ee
Fix building installers for windows
2011-08-13 22:18:44 +02:00
Dominik Schmidt
6be91dd558
Fix cross-compilation in cmake 2.8.5
2011-08-12 14:05:47 +02:00
Christian Muehlhaeuser
c8ba2ee171
Revert "Use 512x512 icon on osx as lion has bigger icon previews"
...
This reverts commit b7649a32817056b89ea2f2d97d8cf3a89c09645a.
2011-08-11 22:27:31 +02:00
Dominik Schmidt
f05c58150e
Fix FindPhonon.cmake to respect find_version
2011-08-08 14:54:54 +02:00
Dominik Schmidt
7dc1e94ae6
Fix FindCLucene.cmake to respect find_version
2011-08-08 14:53:35 +02:00
Leo Franchi
b7649a3281
Use 512x512 icon on osx as lion has bigger icon previews
2011-07-27 08:46:11 -04:00
Dominik Schmidt
499f45402f
Build installers with phonon-vlc and vlc from 0.1 time because currently mingw32-phonon-vlc is broken
2011-07-25 00:32:35 +02:00
Dominik Schmidt
34c618ed94
Fix windows deployment to use local vlc plugins again
2011-07-24 00:36:34 +02:00
Christian Muehlhaeuser
0a5f9ba290
* Use the same unique revision identifier as git itself.
2011-07-20 06:56:31 +02:00
Christian Muehlhaeuser
485b40b22b
* Added branch name to version string.
2011-07-20 05:47:13 +02:00
Christian Muehlhaeuser
b771a23e23
* Fixed checking date executable variable.
2011-07-20 02:05:16 +02:00
Christian Muehlhaeuser
ffd4ba4edf
* Fixed TWK-243: Show git revision in version number.
2011-07-20 02:02:37 +02:00
Dominik Schmidt
7c5d6033d4
Add date and git revision to non-release package names
2011-07-07 03:18:12 +02:00
Dominik Schmidt
18aba6856b
Use CPack for building the windows installer
2011-07-07 02:52:31 +02:00
Dominik Schmidt
e7bdc077d2
Don't use QJSON_LDFLAGS on windows
2011-05-26 21:52:38 +02:00
Leo Franchi
d5df5f7676
Set cache mode so cmake doesn't forget our own set variable and fallback to pkgconfig-set one.
2011-05-26 08:43:32 -04:00
Jeff Mitchell
c59747e1e1
Fix QJson linking
2011-05-25 11:48:05 -04:00