diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:14 +0100 |
| commit | dca175454aefdd019952d941c6369c314e8c3b11 (patch) | |
| tree | 82e11b9e741ba07a7a32377048f1eb823ea76903 /examples | |
| parent | 495ea425b376f5b6d65a078c4699e4b7b60a145f (diff) | |
| parent | 31ff679359172dfa068014ab0537418f5b852eac (diff) | |
| download | qtlocation-dca175454aefdd019952d941c6369c314e8c3b11.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ibd6d68ced4edbd96fb67fe61244b83d597df5775
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/positioning/positioning.pro | 5 | ||||
| -rw-r--r-- | examples/positioning/weatherinfo/weatherinfo.pro | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/examples/positioning/positioning.pro b/examples/positioning/positioning.pro index 0e436b46..bbdc1a42 100644 --- a/examples/positioning/positioning.pro +++ b/examples/positioning/positioning.pro @@ -1,4 +1,7 @@ TEMPLATE = subdirs qtHaveModule(widgets): SUBDIRS += logfilepositionsource -qtHaveModule(quick): SUBDIRS += geoflickr weatherinfo satelliteinfo +qtHaveModule(quick) { + SUBDIRS += geoflickr satelliteinfo + qtHaveModule(network): SUBDIRS += weatherinfo +} diff --git a/examples/positioning/weatherinfo/weatherinfo.pro b/examples/positioning/weatherinfo/weatherinfo.pro index e2b2102d..d8f9675a 100644 --- a/examples/positioning/weatherinfo/weatherinfo.pro +++ b/examples/positioning/weatherinfo/weatherinfo.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = weatherinfo QT += core network positioning qml quick +requires(qtConfig(bearermanagement)) SOURCES += main.cpp \ appmodel.cpp |