From 9a6235509c3a750edada0bb23c99da18d7cf697c Mon Sep 17 00:00:00 2001 From: Jonathan Bagg Date: Tue, 14 Mar 2017 13:21:34 -0400 Subject: [PATCH] Q_DECL_IMPORT was being triggered when QZeroConf was build statically into another project --- README.md | 4 ++++ example/test_app.pro | 1 + qzeroconf.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d70f83..ce7d404 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ QZeroConf can be built directly into your project if your project is [LGPL3](htt include(qtzeroconf/qtzeroconf.pri) +4. Add QZEROCONF_STATIC define in your projects .pro file + + DEFINES= QZEROCONF_STATIC + #### Compiling as a dynamic library 1. Clone or download QZeroConf. If you download, unzip. diff --git a/example/test_app.pro b/example/test_app.pro index f834409..7e0c89f 100644 --- a/example/test_app.pro +++ b/example/test_app.pro @@ -2,5 +2,6 @@ QT+= core gui widgets network TARGET = test_app HEADERS= window.h SOURCES= main.cpp window.cpp +DEFINES= QZEROCONF_STATIC include(../qtzeroconf.pri) diff --git a/qzeroconf.h b/qzeroconf.h index 141a253..863aada 100644 --- a/qzeroconf.h +++ b/qzeroconf.h @@ -32,7 +32,7 @@ #include #include -#ifndef QT_STATIC +#if (!defined(QT_STATIC) && !defined(QZEROCONF_STATIC)) # ifdef QT_BUILD_ZEROCONF_LIB # define Q_ZEROCONF_EXPORT Q_DECL_EXPORT # else