1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-22 13:43:11 +02:00

Merge remote branch 'origin/master' into tweetsip

Conflicts:
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/tomahawksettings.cpp
This commit is contained in:
Jeff Mitchell
2011-02-14 13:43:58 -05:00
38 changed files with 763 additions and 288 deletions

View File

@@ -44,6 +44,7 @@ ADD_LIBRARY(tomahawk_jdns SHARED ${TOMAHAWK_JDNS_SOURCES} ${TOMAHAWK_JDNS_MOC})
target_link_libraries(tomahawk_jdns
${QT_LIBRARIES}
${PLATFORM_SPECIFIC_LIBS}
)
SET_TARGET_PROPERTIES( tomahawk_jdns PROPERTIES DEFINE_SYMBOL MAKE_JDNS_LIB )

View File

@@ -23,6 +23,8 @@
#include "qjdns.h"
#include "../jdns_export.h"
class JDnsShared;
class JDnsSharedPrivate;
class JDnsSharedRequestPrivate;
@@ -194,7 +196,7 @@ pub->publish(QJDns::Unique, rec);
\sa JDnsShared
*/
class JDnsSharedRequest : public QObject
class JDNS_EXPORT JDnsSharedRequest : public QObject
{
Q_OBJECT
public:
@@ -401,7 +403,7 @@ dns->addInterface(addr);
\sa JDnsSharedRequest
*/
class JDnsShared : public QObject
class JDNS_EXPORT JDnsShared : public QObject
{
Q_OBJECT
public: