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:
1
thirdparty/jdns/CMakeLists.txt
vendored
1
thirdparty/jdns/CMakeLists.txt
vendored
@@ -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 )
|
||||
|
6
thirdparty/jdns/jdnsshared/jdnsshared.h
vendored
6
thirdparty/jdns/jdnsshared/jdnsshared.h
vendored
@@ -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:
|
||||
|
Reference in New Issue
Block a user