diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-18 12:12:58 +0100 |
| commit | e281537f2049af0b96fd87158f2b7212afe8ab5f (patch) | |
| tree | 7f9e3b14a2456cc779aa165457192094507dd257 /src/network/ssl/qsslkey_winrt.cpp | |
| parent | e0a8b5ce88bc50440dcec2fe3a86d83e2a7dc7b0 (diff) | |
| parent | 84569773db68408704193268bc42a200bb25a924 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/global/qglobal.h
src/platformsupport/platformcompositor/qopenglcompositor.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I5422868500be695584a496dbbbc719d146bc572d
Diffstat (limited to 'src/network/ssl/qsslkey_winrt.cpp')
| -rw-r--r-- | src/network/ssl/qsslkey_winrt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/ssl/qsslkey_winrt.cpp b/src/network/ssl/qsslkey_winrt.cpp index c5b4146ee9..2ec75caefe 100644 --- a/src/network/ssl/qsslkey_winrt.cpp +++ b/src/network/ssl/qsslkey_winrt.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "qssl_p.h" #include "qsslkey.h" #include "qsslkey_p.h" #include "qsslcertificate_p.h" @@ -144,7 +145,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, QByteArray data, const if (padding > 0 && padding <= blockLength) resultLength -= padding; else - qWarning("Invalid padding length of %u; decryption likely failed.", padding); + qCWarning(lcSsl, "Invalid padding length of %u; decryption likely failed.", padding); } return QByteArray(reinterpret_cast<const char *>(resultData), resultLength); |