aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #568. Certificate checking on Mac OS X.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-09-20 14:10:42 +03:00
parent d556508265
commit b28ac8e97b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/vmisc/vabstractapplication.cpp
View File

@ -62,6 +62,7 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
doc(nullptr), doc(nullptr),
openingPattern(false) openingPattern(false)
{ {
QString rules;
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
@ -73,7 +74,7 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
// case will show our messages. Another situation with Qt 5.3 that has many debug // case will show our messages. Another situation with Qt 5.3 that has many debug
// messages itself. We don't need this information and can turn on later if need. // messages itself. We don't need this information and can turn on later if need.
// But here Qt already show our debug messages without enabling. // But here Qt already show our debug messages without enabling.
QLoggingCategory::setFilterRules("*.debug=true\n"); rules += QLatin1String("*.debug=true\n");
#endif // QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
#endif // QT_VERSION < QT_VERSION_CHECK(5, 3, 0) #endif // QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
@ -95,9 +96,16 @@ VAbstractApplication::VAbstractApplication(int &argc, char **argv)
#if defined(V_NO_ASSERT) #if defined(V_NO_ASSERT)
// Ignore SSL-related warnings // Ignore SSL-related warnings
// See issue #528: Error: QSslSocket: cannot resolve SSLv2_client_method. // See issue #528: Error: QSslSocket: cannot resolve SSLv2_client_method.
qputenv("QT_LOGGING_RULES", "qt.network.ssl.warning=false"); rules += QLatin1String("qt.network.ssl.warning=false\n");
// See issue #568: Certificate checking on Mac OS X.
rules += QLatin1String("qt.network.ssl.critical=false\n");
#endif //defined(V_NO_ASSERT) #endif //defined(V_NO_ASSERT)
#endif // QT_VERSION >= QT_VERSION_CHECK(5, 4, 1) #endif // QT_VERSION >= QT_VERSION_CHECK(5, 4, 1)
if (not rules.isEmpty())
{
QLoggingCategory::setFilterRules(rules);
}
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------