diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-12-10 16:33:09 -0800 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-04-20 20:55:51 +0300 |
| commit | efb96e80ece9abbd8df73e44f381a4941fddd57c (patch) | |
| tree | 6e77db5298d2bb04e42b82b07cd29bd7ecc18834 /platform/qt/src/http_file_source.cpp | |
| parent | b9bbe68fe0232f554a7c79185e8954b087a48fde (diff) | |
| download | qtlocation-mapboxgl-efb96e80ece9abbd8df73e44f381a4941fddd57c.tar.gz | |
[Qt] Use Qt resources for bundling the certificates
Diffstat (limited to 'platform/qt/src/http_file_source.cpp')
| -rw-r--r-- | platform/qt/src/http_file_source.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp index a38cf42363..87948609df 100644 --- a/platform/qt/src/http_file_source.cpp +++ b/platform/qt/src/http_file_source.cpp @@ -9,10 +9,18 @@ #include <QNetworkReply> #include <QSslConfiguration> +// Needs to be on the global namespace +// for linking purposes. +void initResources() { + Q_INIT_RESOURCE(qmapbox); +} + namespace mbgl { HTTPFileSource::Impl::Impl() : m_manager(new QNetworkAccessManager(this)) { + initResources(); + QNetworkProxyFactory::setUseSystemConfiguration(true); #if QT_VERSION >= 0x050000 @@ -22,7 +30,7 @@ HTTPFileSource::Impl::Impl() : m_manager(new QNetworkAccessManager(this)) m_ssl.setProtocol(QSsl::TlsV1); #endif - m_ssl.setCaCertificates(QSslCertificate::fromPath("ca-bundle.crt")); + m_ssl.setCaCertificates(QSslCertificate::fromPath(":ca-bundle.crt")); if (m_ssl.caCertificates().isEmpty()) { mbgl::Log::Warning(mbgl::Event::HttpRequest, "Could not load list of certificate authorities"); } |