summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_script_qscriptengineagent.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-26 03:24:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-26 03:24:06 (GMT)
commit56a90692323a79e570c91e0b6ee0f8d075cafea3 (patch)
tree4947d9c93302e3435e6c3a2ee5fc379483ecf04b /doc/src/snippets/code/src_script_qscriptengineagent.cpp
parentc55ac19acfcad0e204d9e9dc47fb4bf891924e0a (diff)
parent075918e796b98155b81871f15bf2eb266a783561 (diff)
downloadQt-56a90692323a79e570c91e0b6ee0f8d075cafea3.zip
Qt-56a90692323a79e570c91e0b6ee0f8d075cafea3.tar.gz
Qt-56a90692323a79e570c91e0b6ee0f8d075cafea3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix cetest build fix for TCP sync connection Fixed QPrintPreview text drawing (visible in Assistant). Fix glyph advance on Mac/Carbon itemChange() is now called when transformation properties change. stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint Fix QLabel::sizeHint() Fix QFontMetrics::height() and QFontMetrics autotest Add QFont::ForceIntegerMetrics style strategy flag Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengineagent.cpp')
0 files changed, 0 insertions, 0 deletions