From e9541b7cf092e9d8c975f3fa433f881c942ae79e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 29 Apr 2020 12:11:57 +0200 Subject: [PATCH 1/2] Remove charts from pro --- nymea-app/nymea-app.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 0de142b6..4b71cbc9 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -2,7 +2,7 @@ TEMPLATE=app TARGET=nymea-app include(../config.pri) -QT += network qml quick quickcontrols2 svg websockets bluetooth charts gui-private +QT += network qml quick quickcontrols2 svg websockets bluetooth gui-private INCLUDEPATH += $$top_srcdir/libnymea-app LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app From e120c9fc89099fcb9b5f7cc56535d3608cb55eba Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 29 Apr 2020 12:35:04 +0200 Subject: [PATCH 2/2] Fix nozeroconf option --- nymea-app/nymea-app.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 4b71cbc9..a699195f 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -2,14 +2,14 @@ TEMPLATE=app TARGET=nymea-app include(../config.pri) -QT += network qml quick quickcontrols2 svg websockets bluetooth gui-private +QT += network qml quick quickcontrols2 svg websockets bluetooth charts gui-private INCLUDEPATH += $$top_srcdir/libnymea-app LIBS += -L$$top_builddir/libnymea-app/ -lnymea-app win32:Debug:LIBS += -L$$top_builddir/libnymea-app/debug win32:Release:LIBS += -L$$top_builddir/libnymea-app/release -linux:!android:LIBS += -lavahi-client -lavahi-common +linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common PRE_TARGETDEPS += ../libnymea-app HEADERS += \