problème de fusion
This commit is contained in:
1 parent
2b25674e5d
commit
f3342746ae
2 files changed
+3
-2
No files matched your search
+1
-1
@@ -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();
|
||||
});
|
||||
|
||||
+2
-1
@@ -3,9 +3,10 @@
|
||||
#include <QString>
|
||||
#include <QByteArray>
|
||||
#include <QObject>
|
||||
#ifdef WITH_MQTT
|
||||
#include <QtMqtt>
|
||||
#include <QtMqtt/QMqttClient>
|
||||
//#include <cstdint>
|
||||
#endif
|
||||
|
||||
#define RED "\e[31m"
|
||||
#define GREEN "\e[32m"
|
||||
|
||||
Reference in new issue
Block a user