problème de fusion
This commit is contained in:
1 parent
2b25674e5d
commit
f3342746ae
2 files changed
+5
-4
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);
|
debug(DEBUGMACRO, "Erreur réseau : " + reply->errorString(), ERROR);
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
debug(DEBUGMACRO, "Notification envoyée", DEBUG);
|
debug(DEBUGMACRO, "Notification envoyée", INFO);
|
||||||
}
|
}
|
||||||
reply->deleteLater();
|
reply->deleteLater();
|
||||||
});
|
});
|
||||||
|
|||||||
+4
-3
@@ -3,9 +3,10 @@
|
|||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QtMqtt>
|
#ifdef WITH_MQTT
|
||||||
#include <QtMqtt/QMqttClient>
|
#include <QtMqtt>
|
||||||
//#include <cstdint>
|
#include <QtMqtt/QMqttClient>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define RED "\e[31m"
|
#define RED "\e[31m"
|
||||||
#define GREEN "\e[32m"
|
#define GREEN "\e[32m"
|
||||||
|
|||||||
Reference in new issue
Block a user