From efb96e80ece9abbd8df73e44f381a4941fddd57c Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Thu, 10 Dec 2015 16:33:09 -0800 Subject: [Qt] Use Qt resources for bundling the certificates --- platform/qt/src/http_file_source.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'platform/qt/src/http_file_source.cpp') 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 #include +// 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"); } -- cgit v1.2.1