summaryrefslogtreecommitdiffstats
path: root/tradeshow
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2017-02-20 08:52:32 +0100
committerKari Hautamäki <kari.hautamaki@qt.io>2017-02-20 08:22:23 +0000
commit8479cd598ace19337ff497ef7b3a1020aff0ab5b (patch)
treec362d8dc4db8865cc4867ce2455ea5b1f71db74f /tradeshow
parent9c876c95c2525bd89c0aa78b0cab1bee9e2202f1 (diff)
Change to more details cloud naming
In case additional protocols get added, cloud can be a confusing and to generic name. Change-Id: I3ff4ac0178e017c42684514a1923e718bb1fe5b7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
Diffstat (limited to 'tradeshow')
-rw-r--r--tradeshow/iot-sensortag/SensorTagDemo.pro6
-rw-r--r--tradeshow/iot-sensortag/main.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/tradeshow/iot-sensortag/SensorTagDemo.pro b/tradeshow/iot-sensortag/SensorTagDemo.pro
index 9fab11c..6301c56 100644
--- a/tradeshow/iot-sensortag/SensorTagDemo.pro
+++ b/tradeshow/iot-sensortag/SensorTagDemo.pro
@@ -60,7 +60,7 @@ HEADERS += \
seriesstorage.h
BLUETOOTH_LINUX_HOST {
- !winrt:CONFIG += UPDATE_TO_CLOUD
+ !winrt:CONFIG += UPDATE_TO_AZURE
DEFINES += RUNS_AS_HOST
SOURCES += \
@@ -76,10 +76,10 @@ BLUETOOTH_LINUX_HOST {
bluetoothdevice.h
}
-UPDATE_TO_CLOUD {
+UPDATE_TO_AZURE {
SOURCES += cloudupdate.cpp
HEADERS += cloudupdate.h
- DEFINES += CLOUD_UPLOAD
+ DEFINES += AZURE_UPLOAD
# For Azure libs
win32 {
LIBS += -lwastorage
diff --git a/tradeshow/iot-sensortag/main.cpp b/tradeshow/iot-sensortag/main.cpp
index f676081..e6f3381 100644
--- a/tradeshow/iot-sensortag/main.cpp
+++ b/tradeshow/iot-sensortag/main.cpp
@@ -64,7 +64,7 @@
#include "clouddataproviderpool.h"
#include "mockdataprovider.h"
#include "demodataproviderpool.h"
-#ifdef CLOUD_UPLOAD
+#ifdef AZURE_UPLOAD
#include "cloudupdate.h"
#endif
#include "seriesstorage.h"
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
qmlRegisterType<DataProviderPool>("SensorTag.DataProvider", 1, 0, "DataProviderPool");
qmlRegisterType<SeriesStorage>("SensorTag.SeriesStorage", 1, 0, "SeriesStorage");
-#if defined(RUNS_AS_HOST) && defined(CLOUD_UPLOAD)
+#if defined(RUNS_AS_HOST) && defined(AZURE_UPLOAD)
CloudUpdate update;
if (sensorSource == "sensor" || sensorSource == "mock") {
update.setDataProviderPool(dataProviderPool);