From cb1aaabf5e2b5782f556816629d90199de083feb Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 3 Feb 2020 23:23:14 +0100 Subject: [PATCH] Allow disabling QtZeroConf by qmake option --- LICENSES | 8 ++++++-- libnymea-app-core/libnymea-app-core.pro | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/LICENSES b/LICENSES index c9de88ee..eb68918f 100644 --- a/LICENSES +++ b/LICENSES @@ -9,8 +9,8 @@ to meet the development and distribution needs of both commercial distributors Commercial License With the commercial license you can combine and distribute your software with -nymea for any commercial purpose. You don’t have to comply with the rules of -the open-source license. +nymea for any commercial purpose without the implications of the open-sources +on nymea code. Please keep in mind, that nymea is based on the Qt framework and thus requires a valid Qt license. @@ -18,6 +18,8 @@ a valid Qt license. The nymea commercial license comes with additional tools and services to make a developers life easier. You can download the terms and conditions here. +Please contact contact@nymea.io for further details. + =============================================================================== Open-Source License @@ -62,6 +64,8 @@ Files: QtZeroConf/ The QtZeroConf library is provided by Jonathan Bagg and licensed under the terms of the GNU Lesser General Public License, version 3. Please see LICENSE.LGPL3 for more details. +QtZeroConf can be excluded by adding the config option CONFIG-=nozeroconf +to qmake. * OpenSSL Files: windows_openssl/* and android_openssl/* diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro index 3079594c..c1fc4788 100644 --- a/libnymea-app-core/libnymea-app-core.pro +++ b/libnymea-app-core/libnymea-app-core.pro @@ -3,12 +3,15 @@ TEMPLATE = lib CONFIG += staticlib include(../config.pri) -!win32: { +!win32:!nozeroconf { # To enable this on Windows we'd need to install Bonjour # https://support.apple.com/kb/DL999 + message("Building with QtZeroConf") DEFINES += QZEROCONF_STATIC DEFINES += WITH_ZEROCONF include(../QtZeroConf/qtzeroconf.pri) +} else { + message("Building without QtZeroConf") } include(../nymea-remoteproxy/libnymea-remoteproxyclient/libnymea-remoteproxyclient.pri)