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

disable ccache for jenkins (will be done with build script)

Browse Source
This commit is contained in:
Simon Stürz 2016-06-17 09:39:05 +02:00 committed by Michael Zanetti
parent 69a8d881d2
commit ac52bac1e4
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guh.pri
View File

@ -2,7 +2,7 @@
GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"')
# define protocol versions # define protocol versions
JSON_PROTOCOL_VERSION=41 JSON_PROTOCOL_VERSION=42
REST_API_VERSION=1 REST_API_VERSION=1
DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" \ DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" \
@ -13,7 +13,7 @@ QT+= network websockets
QMAKE_CXXFLAGS += -Werror -std=c++11 -g QMAKE_CXXFLAGS += -Werror -std=c++11 -g
QMAKE_LFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11
QMAKE_CXX = ccache g++ #QMAKE_CXX = g++ ccache
top_srcdir=$$PWD top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD) top_builddir=$$shadowed($$PWD)

5
guh.pro
View File

@ -45,6 +45,11 @@ coverage {
message("Building coverage.") message("Building coverage.")
} }
# Build using ccache
ccache {
message("Using ccache.")
}
# Build tests # Build tests
disabletesting { disabletesting {
message("Building guh without tests") message("Building guh without tests")

2
server/cloud/cloudconnection.cpp
View File

@ -140,8 +140,6 @@ void CloudConnection::onError(const QAbstractSocket::SocketError &error)
void CloudConnection::onTextMessageReceived(const QString &message) void CloudConnection::onTextMessageReceived(const QString &message)
{ {
//qCDebug(dcCloud()) << "Cloud message -> " << qUtf8Printable(message.toUtf8());
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(message.toUtf8(), &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(message.toUtf8(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {