summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-04 03:04:43 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-04 03:04:43 +0200
commit70752a28042b68f1f086c80371d31dc968d44dcc (patch)
tree68b743eb57da17dc6b49ccfccfe78f8b2ac34d5d
parent1c61d6de77657d60814d582153e75ace6597dde7 (diff)
parenta6ac8739a23c4101a3c582aa89281aa90027128f (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--examples/location/mapviewer/main.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/location/mapviewer/main.cpp b/examples/location/mapviewer/main.cpp
index 39c117ed..b332de8c 100644
--- a/examples/location/mapviewer/main.cpp
+++ b/examples/location/mapviewer/main.cpp
@@ -52,7 +52,9 @@
#include <QtGui/QGuiApplication>
#include <QtQml/QQmlApplicationEngine>
#include <QtQuick/QQuickItem>
+#if QT_CONFIG(ssl)
#include <QSslSocket>
+#endif
#include <QQmlContext>
static bool parseArgs(QStringList& args, QVariantMap& parameters)
@@ -133,7 +135,11 @@ int main(int argc, char *argv[])
parameters[QStringLiteral("osm.useragent")] = QStringLiteral("QtLocation Mapviewer example");
QQmlApplicationEngine engine;
+#if QT_CONFIG(ssl)
engine.rootContext()->setContextProperty("supportsSsl", QSslSocket::supportsSsl());
+#else
+ engine.rootContext()->setContextProperty("supportsSsl", false);
+#endif
engine.addImportPath(QStringLiteral(":/imports"));
engine.load(QUrl(QStringLiteral("qrc:///mapviewer.qml")));
QObject::connect(&engine, SIGNAL(quit()), qApp, SLOT(quit()));