From 925485d916d8138905ef58bf96f4d828bfcd5112 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 14 May 2011 01:07:03 +0200 Subject: [PATCH] win32: some compilation/linking fixes, still does not build --- src/configdelegatebase.h | 2 +- src/sip/jreen/avatarmanager.h | 3 ++- src/sip/jreen/tomahawksipmessage.h | 4 +++- src/sip/jreen/tomahawksipmessagefactory.h | 4 +++- src/sip/jreen/xmlconsole.h | 4 +++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/configdelegatebase.h b/src/configdelegatebase.h index 8f98685ba..d86baad1a 100644 --- a/src/configdelegatebase.h +++ b/src/configdelegatebase.h @@ -26,7 +26,7 @@ #define PADDING 4 class QPainter; -class DLLEXPORT ConfigDelegateBase : public QStyledItemDelegate +class Q_DECL_EXPORT ConfigDelegateBase : public QStyledItemDelegate { Q_OBJECT public: diff --git a/src/sip/jreen/avatarmanager.h b/src/sip/jreen/avatarmanager.h index 71852285c..a1a43d46c 100644 --- a/src/sip/jreen/avatarmanager.h +++ b/src/sip/jreen/avatarmanager.h @@ -6,8 +6,9 @@ #include #include +#include "../sipdllmacro.h" -class AvatarManager : public QObject +class SIPDLLEXPORT AvatarManager : public QObject { Q_OBJECT diff --git a/src/sip/jreen/tomahawksipmessage.h b/src/sip/jreen/tomahawksipmessage.h index 8e74e7059..70289750e 100644 --- a/src/sip/jreen/tomahawksipmessage.h +++ b/src/sip/jreen/tomahawksipmessage.h @@ -5,8 +5,10 @@ #define TOMAHAWK_SIP_MESSAGE_NS QLatin1String("http://www.tomhawk-player.org/sip/transports") +#include "../sipdllmacro.h" + class TomahawkSipMessagePrivate; -class TomahawkSipMessage : public Jreen::StanzaExtension +class SIPDLLEXPORT TomahawkSipMessage : public Jreen::StanzaExtension { J_EXTENSION(TomahawkSipMessage, "") Q_DECLARE_PRIVATE(TomahawkSipMessage) diff --git a/src/sip/jreen/tomahawksipmessagefactory.h b/src/sip/jreen/tomahawksipmessagefactory.h index 318208710..a89027c77 100644 --- a/src/sip/jreen/tomahawksipmessagefactory.h +++ b/src/sip/jreen/tomahawksipmessagefactory.h @@ -21,7 +21,9 @@ #include -class TomahawkSipMessageFactory : public Jreen::StanzaExtensionFactory +#include "../sipdllmacro.h" + +class SIPDLLEXPORT TomahawkSipMessageFactory : public Jreen::StanzaExtensionFactory { public: TomahawkSipMessageFactory(); diff --git a/src/sip/jreen/xmlconsole.h b/src/sip/jreen/xmlconsole.h index c44ab3302..6254df941 100644 --- a/src/sip/jreen/xmlconsole.h +++ b/src/sip/jreen/xmlconsole.h @@ -32,7 +32,9 @@ namespace Ui { class XmlConsole; } -class XmlConsole : public QWidget, public Jreen::XmlStreamHandler +#include "../sipdllmacro.h" + +class SIPDLLEXPORT XmlConsole : public QWidget, public Jreen::XmlStreamHandler { Q_OBJECT