Skip to content

Commit feed3a6

Browse files
committedSep 25, 2024
conditionally build with mqtt to allow dev without this deps
1 parent f751b45 commit feed3a6

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed
 

‎calaos_installer.pro

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
QT += core gui network widgets xml printsupport mqtt
1+
QT += core gui network widgets xml printsupport
2+
3+
qtHaveModule(mqtt) {
4+
QT += mqtt
5+
DEFINES += QT_MQTT_AVAILABLE
6+
SOURCES += src/DialogZigbee2mqtt.cpp
7+
HEADERS += src/DialogZigbee2mqtt.h
8+
}
29

310
equals(QT_MAJOR_VERSION, 6) {
411
QT += core5compat
@@ -19,7 +26,6 @@ CONFIG += c++11
1926
TARGET = calaos_installer
2027
TEMPLATE = app
2128
SOURCES += src/main.cpp \
22-
src/DialogZigbee2mqtt.cpp \
2329
src/SimpleCrypt.cpp \
2430
src/mainwindow.cpp \
2531
src/common/base64.c \
@@ -111,7 +117,6 @@ SOURCES += src/main.cpp \
111117
src/FormActionPush.cpp
112118

113119
HEADERS += src/mainwindow.h \
114-
src/DialogZigbee2mqtt.h \
115120
src/SimpleCrypt.h \
116121
src/common/Utils.h \
117122
src/common/base64.h \

‎src/formrules.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
#include "DialogNewAVReceiver.h"
88
#include "dialognewwebioshutter.h"
99
#include "wizards/hue/wizardhue.h"
10+
11+
#ifdef QT_MQTT_AVAILABLE
1012
#include "DialogZigbee2mqtt.h"
13+
#endif
1114

1215
FormRules::FormRules(QWidget *parent) :
1316
QWidget(parent),
@@ -671,6 +674,7 @@ FormRules::FormRules(QWidget *parent) :
671674
addCalaosIO(p);
672675
});
673676

677+
#ifdef QT_MQTT_AVAILABLE
674678
action = add_menu->addAction(tr("Zigbee2mqtt device"));
675679
action->setIcon(QIcon(":/img/zigbee2mqtt.png"));
676680
connect(action, &QAction::triggered, this, [=]()
@@ -691,6 +695,7 @@ FormRules::FormRules(QWidget *parent) :
691695
addCalaosIO(p);
692696
}
693697
});
698+
#endif
694699

695700
add_menu->addSeparator();
696701

0 commit comments

Comments
 (0)
Please sign in to comment.