summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qmake.qdocconf
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-08 10:40:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-08 10:40:47 (GMT)
commitab01d0f9ad79cb80fce2ee6c889c98bc7e35e5f2 (patch)
tree58eaa299c0d87d6d678fe635fddaab42177328cf /tools/qdoc3/test/qmake.qdocconf
parentdfd7c876263310c03d8b64033749efe2b6b1e081 (diff)
parent03dc74984749adf5b11482bf871a47086217845c (diff)
downloadQt-ab01d0f9ad79cb80fce2ee6c889c98bc7e35e5f2.zip
Qt-ab01d0f9ad79cb80fce2ee6c889c98bc7e35e5f2.tar.gz
Qt-ab01d0f9ad79cb80fce2ee6c889c98bc7e35e5f2.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (44 commits) fix translations from some header files being omitted Revert changes to syncqt. Fix style sheet error with slider handle deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: tabs changes to spaces Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d6d6c3821ed111b214a753f1ce8fa969c1a94dc3 ) fix misleading hint support TARGETs with spaces propagate code change back to .g source double-quote string which contains a single-quote Fix the bindTexture() filters on X11 to not rely on mipmap generation. Fix QWS build failure Removed compiler warnings qmake: don't warn about unknown MSVC compiler option /MP Window visibility changes update TLW backing store reference count Enable visibility change events on all Symbian native windows Added reference counting to QWidgetBackingStore Added tst_QWidget::destroyBackingStoreWhenHidden Windows CE: missing null check added in qapplication_win.cpp Clipping with rounded rectangles and QVG_SCISSOR_CLIP ...
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
0 files changed, 0 insertions, 0 deletions