summaryrefslogtreecommitdiff
path: root/tools/designer/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-16 11:44:52 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-16 11:44:52 +1000
commite318b0276c3d4a0db8660b4fa6d68f1784aee522 (patch)
treebc8c6132417a7337f874e01fc5c820cf9a9fc2c8 /tools/designer/src
parent596c8c65524d27b2537986b94c19d796219217b9 (diff)
parentad0f3996a9674def59766726db34191844d2af0a (diff)
downloadqt4-tools-e318b0276c3d4a0db8660b4fa6d68f1784aee522.tar.gz
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (31 commits) SSL: give protocol enum SecureProtocols an own value QMAKE: Fix post build events for VS2010 SSL backend: avoid setting SNI hostname for old SSL versions SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3) SSL: introduce new option TlsV1SslV3 for SSL communication Mac Style: Compile Fix Mac: Center the Window title on Cocoa. Fix corner of scroll area so it is stylable on Mac. QNAM HTTP: Pair channels with requests at a later state. tst_qnetworkreply: fix MiniHttpServer crash Windows: Activate the context menu on tray icons when shown. SSL backend: check at runtime for the right OpenSSL version for SNI QNAM HTTP: Fix the ioPostToHttpFromSocket auto test Disable capabilities example for symbian-gcce due to a bug in elf2e32 Fixed documentation for QByteArray Improve handling QByteArray with QStringBuilder Do not handle posted events in QSplashScreen. SSL tests: Be more verbose in on-demand cert test Fix qstringbuilder test. Wrap qPrintable inside QString ...
Diffstat (limited to 'tools/designer/src')
0 files changed, 0 insertions, 0 deletions