diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-01 08:01:56 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-01 08:01:56 +0200 |
commit | 5ea190ac941ed9889de049df221b56db065529d0 (patch) | |
tree | c0b7b4b2a6bb30c4ec1a653715760c50d9e34ce9 /examples | |
parent | 5389a65dc7434c4ed269a5d0c5cb93f5b12823ba (diff) | |
parent | 5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac (diff) | |
download | qtlocation-5ea190ac941ed9889de049df221b56db065529d0.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
Diffstat (limited to 'examples')
-rw-r--r-- | examples/location/mapviewer/main.cpp | 3 | ||||
-rw-r--r-- | examples/location/mapviewer/mapviewer.qml | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/examples/location/mapviewer/main.cpp b/examples/location/mapviewer/main.cpp index 73bc937b..39c117ed 100644 --- a/examples/location/mapviewer/main.cpp +++ b/examples/location/mapviewer/main.cpp @@ -52,6 +52,8 @@ #include <QtGui/QGuiApplication> #include <QtQml/QQmlApplicationEngine> #include <QtQuick/QQuickItem> +#include <QSslSocket> +#include <QQmlContext> static bool parseArgs(QStringList& args, QVariantMap& parameters) { @@ -131,6 +133,7 @@ int main(int argc, char *argv[]) parameters[QStringLiteral("osm.useragent")] = QStringLiteral("QtLocation Mapviewer example"); QQmlApplicationEngine engine; + engine.rootContext()->setContextProperty("supportsSsl", QSslSocket::supportsSsl()); engine.addImportPath(QStringLiteral(":/imports")); engine.load(QUrl(QStringLiteral("qrc:///mapviewer.qml"))); QObject::connect(&engine, SIGNAL(quit()), qApp, SLOT(quit())); diff --git a/examples/location/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml index e97076ab..e8b016aa 100644 --- a/examples/location/mapviewer/mapviewer.qml +++ b/examples/location/mapviewer/mapviewer.qml @@ -429,6 +429,19 @@ ApplicationWindow { focus: true initialItem: Item { id: page + + Text { + visible: !supportsSsl && map && map.activeMapType && activeMapType.metadata.isHTTPS + text: "The active map type\n +requires (missing) SSL\n +support" + horizontalAlignment: Text.AlignHCenter + font.pixelSize: appWindow.width / 12 + font.bold: true + color: "grey" + anchors.centerIn: parent + z: 12 + } } function showMessage(title,message,backPage) |