summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
Commit message (Collapse)AuthorAgeFilesLines
* QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| | | | Reviewed-by: Andreas Aardal Hanssen
* Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-126-3/+60
|\ | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * QSslSocket: Wrong warning message in startServerEncryptionMarkus Goetz2009-06-101-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0Bernhard Rosenkraenzer2009-06-095-2/+59
| | | | | | | | | | | | | | (-beta2, but 1.0.0 final shouldn't be very different) Merge-request: 449 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * Doc typo fix in QSslSocketMarkus Goetz2009-06-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | improved string operations all over the placeThierry Bastian2009-05-285-19/+19
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-272-25/+2
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * SSL: Remove broken system certificate loading codeMarkus Goetz2009-05-261-24/+1
| | | | | | | | | | Task-number: 254365 Reviewed-by: Peter Hartmann
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | QSsl: Renamed testConnection to startHandshakeMarkus Goetz2009-05-122-7/+7
| |
* | Small documentation fix for QSslSocketMarkus Goetz2009-05-121-2/+2
| | | | | | | | Reviewed-by: Kavindra
* | Merge branch '4.5'Thiago Macieira2009-05-071-3/+6
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * Fix OpenSSL dynamic loading on OpenBSD.Thiago Macieira2009-05-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | OpenBSD's OpenSSL libraries are linked in a bizarre way: libssl.so doesn't link to libcrypto.so, even though it depends on it. I don't claim to understand why, but they do it. So make sure we export its symbols for libssl to see and we load libcrypto first. Task-number: 252042 Patch by: Marc Espie <espie@openbsd.org> Reviewed-by: Peter Hartmann
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-1/+1
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Moved the QT_BEGIN_NAMESPACE macro to the right place in qsslcipher.cppThiago Macieira2009-05-061-1/+1
| | | | | | | | | | Task-number: 252298 Reviewed-by: Peter Hartmann
| * Long live Qt 4.5!Lars Knoll2009-03-2325-0/+10041
|
* Small documentation enhancement for QSslSocketMarkus Goetz2009-03-251-2/+5
| | | | RevBy: TrustMe
* Long live Qt!Lars Knoll2009-03-2325-0/+10073