diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-28 21:04:07 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-12-28 21:04:07 -0800 |
| commit | 7c8a39015a969d853fa5ff4b73f7e1f30aa39a17 (patch) | |
| tree | 5eea5161745e0ea2e8f2c1ebb783b804fb339a6d | |
| parent | 90ff8e672b911f17bb7849f9d8316577b3ed59cf (diff) | |
| download | subsurface-7c8a39015a969d853fa5ff4b73f7e1f30aa39a17.tar.gz | |
Enable https for Windows binaries
This requires the ssleay32.dll and libeay32.dll to be copied into
packaging/windows, first.
Fixes #367
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 4 | ||||
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 2803a049e..956ecf41b 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -106,7 +106,7 @@ Section File /r translations File iconv.dll File libdivecomputer-0.dll - File libpng15-15.dll + File libpng16-16.dll File libjpeg-*.dll File libusb-1.0.dll File libxml2-2.dll @@ -118,6 +118,8 @@ Section File libstdc++-6.dll File libmarblewidget*dll File libssl-10.dll + File libeay32.dll + File ssleay32.dll File Qt*4.dll File subsurface.ico File qt.conf diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index b025b45bd..30efbad93 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -628,11 +628,7 @@ 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; @@ -663,11 +659,7 @@ 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"); @@ -711,8 +703,7 @@ void DivelogsDeWebServices::listDownloadFinished() ui.status->setText(tr("Downloading %1 dives...").arg(diveList.idCount)); QNetworkRequest request; -// request.setUrl(QUrl("https://divelogs.de/DivelogsDirectExport.php")); - request.setUrl(QUrl("http://divelogs.de/DivelogsDirectExport.php")); + request.setUrl(QUrl("https://divelogs.de/DivelogsDirectExport.php")); request.setRawHeader("Accept", "application/zip, */*"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); |