feedc0de/QtZeroConf
1
0
Fork 0
forked from jbagg/QtZeroConf
Code Pull Requests Activity

Move Q_DECL_EXPORT / IMPORT into qzeroconfglobal.h

Browse Source
This commit is contained in:
Jonathan Bagg
2017-10-31 20:30:42 -04:00
parent bf2f5b8742
commit 00be205f0f
4 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qtzeroconf.pri
View File

@ -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

12
qzeroconf.h
View File

@ -30,19 +30,9 @@
#include <QObject>
#include <QHostAddress>
#include <QMap>
#include <QtCore/QtGlobal>
#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

42
qzeroconfglobal.h Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
---------------------------------------------------------------------------------------------------
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 <QtCore/QtGlobal>
#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

3
qzeroconfservice.h
View File

@ -3,10 +3,11 @@
#include <QSharedDataPointer>
#include <QHostAddress>
#include "qzeroconfglobal.h"
class QZeroConfServiceData;
class QZeroConfService
class Q_ZEROCONF_EXPORT QZeroConfService
{
Q_GADGET
Q_PROPERTY( QString name READ name )