problème de fusion

src/pws2mqtt.cpp

@@ -161,7 +161,7 @@ void notify(QString notif, QString priority, QString inputPath, QString tag)
 			debug(DEBUGMACRO, "Erreur réseau : " + reply->errorString(), ERROR);
 		} else
 		{
-			debug(DEBUGMACRO, "Notification envoyée", DEBUG);
+			debug(DEBUGMACRO, "Notification envoyée", INFO);
 		}
 		reply->deleteLater();
 	});

src/pws2mqtt.h

@@ -3,9 +3,10 @@
 #include <QString>
 #include <QByteArray>
 #include <QObject>
-#include <QtMqtt>
-#include <QtMqtt/QMqttClient>
-//#include <cstdint>
+#ifdef WITH_MQTT
+	#include <QtMqtt>
+	#include <QtMqtt/QMqttClient>
+#endif
 
 #define RED "\e[31m"
 #define GREEN "\e[32m"