diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-21 09:56:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-21 09:57:00 +0100 |
| commit | 1820ec590050d37fc7b66cf1f6716f972eb6d684 (patch) | |
| tree | 52d54ea7ff921005936e122d74eb4d0a57c49bce /tradeshow/iot-sensortag/SensorTagDemo.pro | |
| parent | c22860511e43ac88a2bad398a0dfcea537501e16 (diff) | |
| parent | f9c7da64cea85d44998e62f4e0d3ec217a22f0d2 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I08eb1b887d7b8cfaae3e105d176136886682c865
Diffstat (limited to 'tradeshow/iot-sensortag/SensorTagDemo.pro')
| -rw-r--r-- | tradeshow/iot-sensortag/SensorTagDemo.pro | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/tradeshow/iot-sensortag/SensorTagDemo.pro b/tradeshow/iot-sensortag/SensorTagDemo.pro index bae8f07..6be190e 100644 --- a/tradeshow/iot-sensortag/SensorTagDemo.pro +++ b/tradeshow/iot-sensortag/SensorTagDemo.pro @@ -13,6 +13,9 @@ QT += \ CONFIG += c++11 DEFINES += QT_NO_FOREACH +# Specify UI layout to use: UI_SMALL or UI_WATCH +DEFINES += UI_WATCH + # To overcome the bug QTBUG-58648, uncomment this define # Needed at least for RPi3 and iMX #CONFIG += DEPLOY_TO_FS @@ -27,6 +30,11 @@ win32|linux|android:!qnx { # This enables both, host and client mode # CONFIG += UPDATE_TO_MQTT_BROKER +# For using Azure cloud connectivity enable +# this config. This enabled both, host and +# client mode +# CONFIG += UPDATE_TO_AZURE + win32:!contains(CONFIG, UPDATE_TO_MQTT_BROKER) { WASTORAGE_PATH = $$(WASTORAGE_LOCATION) isEmpty(WASTORAGE_PATH): message("Location for Azure Storage libs unknown. Please specify WASTORAGE_LOCATION") @@ -61,11 +69,6 @@ HEADERS += \ mockdataproviderpool.h BLUETOOTH_HOST { - win32 { - !isEmpty(WASTORAGE_PATH):!isEmpty(CPPRESTSDK_LOCATION): CONFIG += UPDATE_TO_AZURE - } else { - CONFIG += UPDATE_TO_AZURE - } DEFINES += RUNS_AS_HOST SOURCES += \ @@ -115,8 +118,16 @@ UPDATE_TO_AZURE { RESOURCES += base.qrc -!DEPLOY_TO_FS: RESOURCES += uismall.qrc -uiVariant.files = resources/small +android: ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources + +contains(DEFINES, UI_SMALL) { + !DEPLOY_TO_FS: RESOURCES += uismall.qrc + uiVariant.files = resources/small +} else:contains(DEFINES, UI_WATCH) { + !DEPLOY_TO_FS: RESOURCES += uiwatch.qrc + uiVariant.files = resources/watch +} else: error("No layout specified") + uiVariant.path = /opt/$${TARGET}/resources # Additional import path used to resolve QML modules in Qt Creator's code model |