From ac52bac1e4cda9ac9c86329c9ace9b52022762ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 17 Jun 2016 09:39:05 +0200 Subject: [PATCH] disable ccache for jenkins (will be done with build script) --- guh.pri | 4 ++-- guh.pro | 5 +++++ server/cloud/cloudconnection.cpp | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/guh.pri b/guh.pri index f91d6d3c..1468f3d7 100644 --- a/guh.pri +++ b/guh.pri @@ -2,7 +2,7 @@ GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') # define protocol versions -JSON_PROTOCOL_VERSION=41 +JSON_PROTOCOL_VERSION=42 REST_API_VERSION=1 DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" \ @@ -13,7 +13,7 @@ QT+= network websockets QMAKE_CXXFLAGS += -Werror -std=c++11 -g QMAKE_LFLAGS += -std=c++11 -QMAKE_CXX = ccache g++ +#QMAKE_CXX = g++ ccache top_srcdir=$$PWD top_builddir=$$shadowed($$PWD) diff --git a/guh.pro b/guh.pro index 2a9c19d0..5f9b031b 100644 --- a/guh.pro +++ b/guh.pro @@ -45,6 +45,11 @@ coverage { message("Building coverage.") } +# Build using ccache +ccache { + message("Using ccache.") +} + # Build tests disabletesting { message("Building guh without tests") diff --git a/server/cloud/cloudconnection.cpp b/server/cloud/cloudconnection.cpp index 58580edd..6d5ce38c 100644 --- a/server/cloud/cloudconnection.cpp +++ b/server/cloud/cloudconnection.cpp @@ -140,8 +140,6 @@ void CloudConnection::onError(const QAbstractSocket::SocketError &error) void CloudConnection::onTextMessageReceived(const QString &message) { - //qCDebug(dcCloud()) << "Cloud message -> " << qUtf8Printable(message.toUtf8()); - QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(message.toUtf8(), &error); if (error.error != QJsonParseError::NoError) {