diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 16:33:42 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-26 16:33:42 (GMT) |
commit | 857cbe43a105617f2ac48e356c31845097e15b84 (patch) | |
tree | a575c9cb831a0342b47cf69e245b58e895a1308b /doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp | |
parent | 2268c602cacc7efe5fa54dd026d1c3455ec76c47 (diff) | |
parent | d6203cfeb0e096575c1fc0254dddc07a3d65d24c (diff) | |
download | Qt-857cbe43a105617f2ac48e356c31845097e15b84.zip Qt-857cbe43a105617f2ac48e356c31845097e15b84.tar.gz Qt-857cbe43a105617f2ac48e356c31845097e15b84.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Do check after all if we have partialUpdateSupport.
QDeclarativeEngineDebugServer: Fix crash when trying to update non-properties.
Doc: use const& in foreach when applicable.
QGLBuffer::bind()/release() should not be const functions.
Use SSSE3 to convert from RGB888 to RGB32
Extend the build system to SSSE3
CPU feature detection for x86_64
Use the appropriate CPUID bitmap for detecting SSE3 etc
Skip tst_QLineEdit::QTBUG697_paletteCurrentColorGroup on non-x11
Stabilize tst_qlineedit.cpp
QScriptEngineAgent: ensure that the top of the backtrace is correct in exceptionThrow
Fix QLineEdit's Highlight color when inactive.
Diffstat (limited to 'doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp')
-rw-r--r-- | doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp b/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp index 5c9421f..937dbb9 100644 --- a/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp +++ b/doc/src/snippets/code/src_network_ssl_qsslcertificate.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //! [0] -foreach (QSslCertificate cert, QSslCertificate::fromPath("C:/ssl/certificate.*.pem", QSsl::Pem, +foreach (const QSslCertificate &cert, QSslCertificate::fromPath("C:/ssl/certificate.*.pem", QSsl::Pem, QRegExp::Wildcard)) { qDebug() << cert.issuerInfo(QSslCertificate::Organization); } |