diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-17 10:46:14 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-17 10:46:14 (GMT) |
commit | 175b4905c0cdd9d79baba2121cda2ac52ae547a7 (patch) | |
tree | 982e37fb314d9c8e5d4cd0a240499edb56710808 /src/gui/text/qfontmetrics.h | |
parent | dee5662e0218e754d425c8960edb1e8ffd27fde6 (diff) | |
parent | 57f2c8b9bd3a7cfd0e1f9636880cb9a6130da885 (diff) | |
download | Qt-175b4905c0cdd9d79baba2121cda2ac52ae547a7.zip Qt-175b4905c0cdd9d79baba2121cda2ac52ae547a7.tar.gz Qt-175b4905c0cdd9d79baba2121cda2ac52ae547a7.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Made Q_ASSERT meaningful again
Introduce new flag for splitview support in Symbian
Fix for clipping failure in OpenVG paint engine.
Use QML notation for documenting TextInput::accepted() signal.
Document the TextInput accepted() signal.
Fix inheritance of widget input contexts.
Fix for ARMV6 drawhelper blending
Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791
QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
Worked around a SC issue in S60 3.x vs 5.0 versions.
Don't leak ScopeChainNode's
Designer: Slots of main container not visible in signal/slot editor.
Apply the gcce link rules for LIBS_PRIVATE too.
Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
Diffstat (limited to 'src/gui/text/qfontmetrics.h')
0 files changed, 0 insertions, 0 deletions