mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-18 03:41:27 +02:00
Code Issues Releases Wiki Activity

Merge branch 'stable-0.8'

Browse Source 
Conflicts:
	src/crashreporter/main.cpp
This commit is contained in:
Dominik Schmidt
2014-10-21 21:41:00 +02:00
parent 73f4c774c3 bb4ad2684c
commit 712c288182
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/crashreporter/main.cpp
View File

@@ -33,7 +33,6 @@
#include <unistd.h>
#endif
// code taken from http://stackoverflow.com/questions/20734831/compress-string-with-gzip-using-qcompress
static const quint32 crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,

2
src/tomahawk/CMakeLists.txt
View File

@@ -146,7 +146,7 @@ IF( BUILD_GUI )
qt_wrap_ui( tomahawkUI_H ${tomahawkUI} )
ENDIF()
kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
tomahawk_add_app_icon( tomahawkSources Tomahawk "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
qt_add_resources( RC_SRCS "../../resources.qrc" )
SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )