ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #420: Fix some includes to be more flexible on finding headers

Browse Source
This commit is contained in:
Jenkins nymea 2021-05-21 15:13:49 +02:00
commit bd570c58b9
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/cloud/awsconnector.h
View File

@ -36,7 +36,7 @@
#include <QDateTime> #include <QDateTime>
#include <QTimer> #include <QTimer>
#include <nymea-mqtt/mqttclient.h> #include <mqttclient.h>
class AWSConnector : public QObject class AWSConnector : public QObject
{ {

2
libnymea-core/cloud/cloudmanager.cpp
View File

@ -39,7 +39,7 @@
#include <networkmanager.h> #include <networkmanager.h>
#include "nymea-remoteproxyclient/remoteproxyconnection.h" #include <remoteproxyconnection.h>
#include <QDir> #include <QDir>
using namespace remoteproxyclient; using namespace remoteproxyclient;

2
libnymea-core/cloud/cloudtransport.h
View File

@ -33,7 +33,7 @@
#include <QObject> #include <QObject>
#include "../transportinterface.h" #include "../transportinterface.h"
#include "remoteproxyconnection.h" #include <remoteproxyconnection.h>
namespace nymeaserver { namespace nymeaserver {

2
libnymea-core/servers/mqttbroker.cpp
View File

@ -31,7 +31,7 @@
#include "mqttbroker.h" #include "mqttbroker.h"
#include "loggingcategories.h" #include "loggingcategories.h"
#include "nymea-mqtt/mqttserver.h" #include <mqttserver.h>
namespace nymeaserver { namespace nymeaserver {

2
libnymea-core/servers/mqttbroker.h
View File

@ -35,7 +35,7 @@
#include <QHostAddress> #include <QHostAddress>
#include <QSslConfiguration> #include <QSslConfiguration>
#include "nymea-mqtt/mqtt.h" #include <mqtt.h>
#include "nymeaconfiguration.h" #include "nymeaconfiguration.h"
class MqttServer; class MqttServer;

1
tests/auto/autotests.pri
View File

@ -1,5 +1,6 @@
QT += dbus testlib network sql websockets QT += dbus testlib network sql websockets
CONFIG += testcase CONFIG += testcase
CONFIG += link_pkgconfig
INCLUDEPATH += $$top_srcdir/libnymea \ INCLUDEPATH += $$top_srcdir/libnymea \
$$top_srcdir/libnymea-core \ $$top_srcdir/libnymea-core \

3
tests/auto/mqttbroker/mqttbroker.pro
View File

@ -2,7 +2,8 @@ include(../../../nymea.pri)
include(../autotests.pri) include(../autotests.pri)
QT += xml QT += xml
PKGCONFIG += nymea-mqtt
LIBS += -lnymea-mqtt
TARGET = mqttbroker TARGET = mqttbroker
SOURCES += testmqttbroker.cpp SOURCES += testmqttbroker.cpp

2
tests/auto/mqttbroker/testmqttbroker.cpp
View File

@ -33,7 +33,7 @@
#include "servers/mqttbroker.h" #include "servers/mqttbroker.h"
#include "servers/mocktcpserver.h" #include "servers/mocktcpserver.h"
#include "nymea-mqtt/mqttclient.h" #include <mqttclient.h>
#include <QXmlReader> #include <QXmlReader>