summarylogtreecommitdiffstats
path: root/qt.patch
diff options
context:
space:
mode:
Diffstat (limited to 'qt.patch')
-rw-r--r--qt.patch32
1 files changed, 23 insertions, 9 deletions
diff --git a/qt.patch b/qt.patch
index b39e9a2307e0..3aff69a51c40 100644
--- a/qt.patch
+++ b/qt.patch
@@ -1,12 +1,26 @@
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
-index 985ea969c..6a62e7a90 100644
+index d3ec67e4418b..edb6e9bc8173 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
-@@ -604,6 +604,7 @@ int main(int argc, char *argv[]) {
- #if QT_VERSION >= 0x050500
- // Because of the POODLE attack it is recommended to disable SSLv3
- // (https://disablessl3.com/), so set SSL protocols to TLS1.0+.
-+ QSslSocket::sslLibraryVersionString();
- QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration();
- sslconf.setProtocol(QSsl::TlsV1_0OrLater);
- QSslConfiguration::setDefaultConfiguration(sslconf);
+@@ -49,7 +49,6 @@
+ #include <QLocale>
+ #include <QMessageBox>
+ #include <QSettings>
+-#include <QSslConfiguration>
+ #include <QStringList>
+ #include <QThread>
+ #include <QTimer>
+@@ -608,13 +608,6 @@ int main(int argc, char *argv[])
+ #ifdef Q_OS_MAC
+ QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
+ #endif
+-#if QT_VERSION >= 0x050500
+- // Because of the POODLE attack it is recommended to disable SSLv3
+- // (https://disablessl3.com/), so set SSL protocols to TLS1.0+.
+- QSslConfiguration sslconf = QSslConfiguration::defaultConfiguration();
+- sslconf.setProtocol(QSsl::TlsV1_0OrLater);
+- QSslConfiguration::setDefaultConfiguration(sslconf);
+-#endif
+
+ // Register meta types used for QMetaObject::invokeMethod
+ qRegisterMetaType<bool *>();