diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 20:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 20:04:57 (GMT) |
| commit | fdcb62d5d6a3e295273042555d2551eb491a5b2d (patch) | |
| tree | 0a8b3a3ef3f71efdfac856fd49b153ddc4ebb034 /src/network/ssl | |
| parent | 33c6983a19942c151fa0bcc878b5219e0b641ba9 (diff) | |
| parent | 90d7b8dd7968c3e63cd3d9b7e8e1b5d83b20b475 (diff) | |
| download | Qt-fdcb62d5d6a3e295273042555d2551eb491a5b2d.zip Qt-fdcb62d5d6a3e295273042555d2551eb491a5b2d.tar.gz Qt-fdcb62d5d6a3e295273042555d2551eb491a5b2d.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (65 commits)
QSslKey: Do not make OpenSSL prompt for a password on stdin
Typo fix in qtestlib
Moved Symbian audio backend into QtMultimedia.dll
Updated Symbian DEF files
Updated qt.iby
Fixed filename cases to support building Qt for Symbian in Linux
Moved softkey "Options" action handling from QMainWindow to QMenuBar.
HotFix for fluidlauncher default size caused by 6d44dadd.
Removed compiler warning from qdesktopwidget_s60.cpp.
Ensure that the entire CLOB can be returned from an Oracle database
QAudioInput sometimes not writing to QIODevice
isalpha() is unspecified for values outside uchar and EOF
Fixed bug in QTransform::type() after using operator/ or operator*.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 )
Doc: Removed lie that access to QBuffer is unbuffered.
Minisplitter doesn't paint to the bottom/right
Support for adding user specified list type content in rss file
Fixed RSS_RULES statement in application_icon.prf
Avoid unnecessary memory allocation in the jpeg handler's image detection
QVarLenghtArray: Call constructor when resizing the array for Movable types.
...
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslkey.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp index 41b2384..da39662 100644 --- a/src/network/ssl/qsslkey.cpp +++ b/src/network/ssl/qsslkey.cpp @@ -119,9 +119,7 @@ void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhra if (!bio) return; - void *phrase = passPhrase.isEmpty() - ? (void *)0 - : (void *)passPhrase.constData(); + void *phrase = (void *)passPhrase.constData(); if (algorithm == QSsl::Rsa) { RSA *result = (type == QSsl::PublicKey) |