diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-15 14:24:30 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-12-15 14:24:30 -0800 |
| commit | 5c2ded584085f79d39e40ad89fd0c52980bab676 (patch) | |
| tree | 1d01e2ea190a82ba1561c8e6f97a3d64bf70a701 | |
| parent | d3065d811ac6441fd0eaa64b17eade4335a5a366 (diff) | |
| download | subsurface-5c2ded584085f79d39e40ad89fd0c52980bab676.tar.gz | |
Disable https on Windows for 4.0
We appear to be missing the correct dll. I'm out of time trying to track
this down, so I just switched Subsurface to access divelogs.de via http on
Windwos.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 1 | ||||
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index aa083828e..e8246fc00 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -118,6 +118,7 @@ Section File libgcc_s_sjlj-1.dll File libstdc++-6.dll File libmarblewidget*dll + File libssl-10.dll File Qt*4.dll File subsurface.ico File qt.conf diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index 150889135..096100ad8 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -623,7 +623,11 @@ void DivelogsDeWebServices::startUpload() ui.password->setEnabled(false); QNetworkRequest request; +#ifdef WIN32 + request.setUrl(QUrl("http://divelogs.de/DivelogsDirectImport.php")); +#else request.setUrl(QUrl("https://divelogs.de/DivelogsDirectImport.php")); +#endif request.setRawHeader("Accept", "text/xml, application/xml"); QHttpPart part; @@ -654,7 +658,11 @@ void DivelogsDeWebServices::startDownload() ui.password->setEnabled(false); QNetworkRequest request; +#ifdef WIN32 + request.setUrl(QUrl("http://divelogs.de/xml_available_dives.php")); +#else request.setUrl(QUrl("https://divelogs.de/xml_available_dives.php")); +#endif request.setRawHeader("Accept", "text/xml, application/xml"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); @@ -766,9 +774,9 @@ void DivelogsDeWebServices::downloadFinished() quint64 entries; #if defined(LIBZIP_VERSION_MAJOR) - entries = zip_get_num_entries(zip, 0); + entries = zip_get_num_entries(zip, 0); #else - // old version of libzip + // old version of libzip entries = zip_get_num_files(zip); #endif |