diff --git a/platform/qt/qmapbox.qrc b/platform/qt/qmapbox.qrc
deleted file mode 100644
index de0c6cdce..000000000
--- a/platform/qt/qmapbox.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- ../../common/ca-bundle.crt
- ../../common/icon.png
-
-
diff --git a/platform/qt/qt4.cmake b/platform/qt/qt4.cmake
index 56e41e847..45c299c8a 100644
--- a/platform/qt/qt4.cmake
+++ b/platform/qt/qt4.cmake
@@ -1,7 +1,5 @@
find_package(Qt4 REQUIRED)
-QT4_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
-
set(MBGL_QT_LIBRARIES
PRIVATE Qt4::QtCore
PRIVATE Qt4::QtGui
diff --git a/platform/qt/qt5.cmake b/platform/qt/qt5.cmake
index 687a041b1..47e178d13 100644
--- a/platform/qt/qt5.cmake
+++ b/platform/qt/qt5.cmake
@@ -6,8 +6,6 @@ find_package(Qt5OpenGL REQUIRED)
find_package(Qt5Quick REQUIRED)
find_package(Qt5Widgets REQUIRED)
-QT5_ADD_RESOURCES(MBGL_QT_FILES platform/qt/qmapbox.qrc)
-
set(MBGL_QT_LIBRARIES
PRIVATE Qt5::Core
PRIVATE Qt5::Gui
diff --git a/platform/qt/resources/common.qrc b/platform/qt/resources/common.qrc
index 9d409760c..d02c04a3c 100644
--- a/platform/qt/resources/common.qrc
+++ b/platform/qt/resources/common.qrc
@@ -1,5 +1,6 @@
+ ../../../common/icon.png
source1.geojson
source2.geojson
label-arrow.svg
diff --git a/platform/qt/src/http_file_source.cpp b/platform/qt/src/http_file_source.cpp
index 9bf2cc5fa..6831c040b 100644
--- a/platform/qt/src/http_file_source.cpp
+++ b/platform/qt/src/http_file_source.cpp
@@ -9,31 +9,11 @@
#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
- m_ssl.setProtocol(QSsl::SecureProtocols);
-#else
- // Qt 4 defines SecureProtocols as TLS1 or SSL3, but we don't want SSL3.
- m_ssl.setProtocol(QSsl::TlsV1);
-#endif
-
- 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");
- }
}
void HTTPFileSource::Impl::request(HTTPRequest* req)
@@ -49,7 +29,6 @@ void HTTPFileSource::Impl::request(HTTPRequest* req)
}
QNetworkRequest networkRequest = req->networkRequest();
- networkRequest.setSslConfiguration(m_ssl);
data.first = m_manager->get(networkRequest);
connect(data.first, SIGNAL(finished()), this, SLOT(onReplyFinished()));
diff --git a/platform/qt/src/http_file_source.hpp b/platform/qt/src/http_file_source.hpp
index 077670706..4ba61b70d 100644
--- a/platform/qt/src/http_file_source.hpp
+++ b/platform/qt/src/http_file_source.hpp
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
@@ -33,7 +32,6 @@ public slots:
private:
QMap>> m_pending;
QNetworkAccessManager *m_manager;
- QSslConfiguration m_ssl;
};
} // namespace mbgl