diff --git a/qtzeroconf.pri b/qtzeroconf.pri index 1b29cfa..d1ee081 100644 --- a/qtzeroconf.pri +++ b/qtzeroconf.pri @@ -116,8 +116,6 @@ android { #avahi-core/iface-none.c avahi-core/iface-pfroute.c avahi-core/avahi-reflector.c } -HEADERS += \ - $$PWD/qzeroconfservice.h +HEADERS+= $$PWD/qzeroconfservice.h $$PWD/qzeroconfglobal.h -SOURCES += \ - $$PWD/qzeroconfservice.cpp +SOURCES+= $$PWD/qzeroconfservice.cpp diff --git a/qzeroconf.h b/qzeroconf.h index 89b1120..4597591 100644 --- a/qzeroconf.h +++ b/qzeroconf.h @@ -30,19 +30,9 @@ #include #include #include -#include +#include "qzeroconfglobal.h" #include "qzeroconfservice.h" -#if (!defined(QT_STATIC) && !defined(QZEROCONF_STATIC)) -# ifdef QT_BUILD_ZEROCONF_LIB -# define Q_ZEROCONF_EXPORT Q_DECL_EXPORT -# else -# define Q_ZEROCONF_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_ZEROCONF_EXPORT -#endif - class QZeroConfPrivate; class Q_ZEROCONF_EXPORT QZeroConf : public QObject diff --git a/qzeroconfglobal.h b/qzeroconfglobal.h new file mode 100644 index 0000000..1f1a183 --- /dev/null +++ b/qzeroconfglobal.h @@ -0,0 +1,42 @@ +/************************************************************************************************** +--------------------------------------------------------------------------------------------------- + Copyright (C) 2017 Jonathan Bagg + This file is part of QtZeroConf. + + QtZeroConf is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QtZeroConf is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with QtZeroConf. If not, see . +--------------------------------------------------------------------------------------------------- + Project name : QtZeroConf + File name : qzeroconfglobal.h + Created : 31 Oct 2017 + Author(s) : Jonathan Bagg +--------------------------------------------------------------------------------------------------- + Sets up Q_DECL_EXPORT / IMPORT for QZeroConf and QZeroConfService classes +--------------------------------------------------------------------------------------------------- +**************************************************************************************************/ +#ifndef QZEROCONFGLOBAL_H +#define QZEROCONFGLOBAL_H + +#include + +#if (!defined(QT_STATIC) && !defined(QZEROCONF_STATIC)) +# ifdef QT_BUILD_ZEROCONF_LIB +# define Q_ZEROCONF_EXPORT Q_DECL_EXPORT +# else +# define Q_ZEROCONF_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_ZEROCONF_EXPORT +#endif + +#endif // QZEROCONFGLOBAL_H diff --git a/qzeroconfservice.h b/qzeroconfservice.h index b388fd0..bf1fb53 100644 --- a/qzeroconfservice.h +++ b/qzeroconfservice.h @@ -3,10 +3,11 @@ #include #include +#include "qzeroconfglobal.h" class QZeroConfServiceData; -class QZeroConfService +class Q_ZEROCONF_EXPORT QZeroConfService { Q_GADGET Q_PROPERTY( QString name READ name )