summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xlib/qxlibscreen.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-20 14:09:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-20 14:09:31 (GMT)
commit7ef9f99301a7c71fdb835f9e1f27d3111557aa2e (patch)
tree1a61e8ab7cc90c698c4def62439a2acc0cec6bad /src/plugins/platforms/xlib/qxlibscreen.h
parent8485052e3991aebf7c823b3e80fc06ccf9f08991 (diff)
parent40a2129c60f21ea6f146d405ebcadb25628db273 (diff)
downloadQt-7ef9f99301a7c71fdb835f9e1f27d3111557aa2e.zip
Qt-7ef9f99301a7c71fdb835f9e1f27d3111557aa2e.tar.gz
Qt-7ef9f99301a7c71fdb835f9e1f27d3111557aa2e.tar.bz2
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: (198 commits) QNetworkCookie: do not access date string out of bounds Fix compile error with QT_NO_OPENSSL Fix qfile autotest hanging in CI system Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows" QSslConfiguration: fix equals operator HTTP+SSL: use default SSL configuration, and avoid setting it explctly QLocale: Fixed double to currency string conversion on Mac. QNativeWifiEngine: Fix problem with wifi polling on Windows Applying the QTBUG-17986 fix to Symbian Added support for libICU for collation and toLower/toUpper. Fix regression with Qt::AutoConnection Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache" Implement support for sockets started before the event loop QUdpSocket autotest updates tst_qnetworkreply: skip ioGetFromBuiltinHttp test. tst_qtcpserver: Add a mapped v4 addr test QHostInfo autotest fixes related to symbian QHostInfo symbian backend finalisation Add autotests for QHostInfo::abortHostLookup Updating comment in QHostInfo::localDomainName ...
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibscreen.h')
0 files changed, 0 insertions, 0 deletions