summaryrefslogtreecommitdiffstats
path: root/src/activeqt/container/qaxselect.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-06 22:17:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-06 22:17:58 (GMT)
commit37094502d4f3ada3b23adf4f6081f9b85d2be7c4 (patch)
tree7754714efc8ba2ddbac41f5e7859ba155f1456ad /src/activeqt/container/qaxselect.h
parent9cc21c043238dc7576a465c9d236e8968fd8c549 (diff)
parent273cc18e59af6b495462cbe101652a444a2cc8f4 (diff)
downloadQt-37094502d4f3ada3b23adf4f6081f9b85d2be7c4.zip
Qt-37094502d4f3ada3b23adf4f6081f9b85d2be7c4.tar.gz
Qt-37094502d4f3ada3b23adf4f6081f9b85d2be7c4.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: licensing: exclude generated cookie jar table from license check fix include path fix build with namespaces in new cookie jar table cookie jar code: enhance security by keeping track of effective TLDs Add support for QMetaType::QVariant in ActiveQt Fix QNetworkReply autotest cases for QT-3494 Add compiler optimization for QtScript/JSC on Symbian improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[] Improve docs for QTEST_MAIN macro. Work around an apparent GCC optimiser bug accessing arrays beyond end Do not crash in case a future version of libdbus has a new kind of message. Docs: QTBUG-9150 Incorrect snippet in class doc. tst_headers: make failure more detailed when failing to open a file Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
Diffstat (limited to 'src/activeqt/container/qaxselect.h')
0 files changed, 0 insertions, 0 deletions