diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-30 03:00:05 +0200 |
| commit | a6ac8739a23c4101a3c582aa89281aa90027128f (patch) | |
| tree | 6732977cf1bf7c36b86a43df9aae1e09d99c59cc | |
| parent | 5d357f90951dde3cbae943dfa8ee44e0b952956d (diff) | |
| parent | 1e88a55671d6514894a663bf207d783e85759781 (diff) | |
| download | qtlocation-a6ac8739a23c4101a3c582aa89281aa90027128f.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I3753abe2e06c0f310abda87dc688b22a02959887
| -rw-r--r-- | examples/location/mapviewer/main.cpp | 6 |
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())); |