summaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-23 03:09:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-23 03:09:51 (GMT)
commit6c4a1d0664f74fc9fe0533ca245d75355695e5be (patch)
treea055210a51704f4454398b64d6a77e4608210369 /doc/doc.pri
parent4894e6dd57c31e0196c6fdae4d1b2fb16b9f1b16 (diff)
parente24aa4af60718e17405871fb3776107adc0b36f1 (diff)
downloadQt-6c4a1d0664f74fc9fe0533ca245d75355695e5be.zip
Qt-6c4a1d0664f74fc9fe0533ca245d75355695e5be.tar.gz
Qt-6c4a1d0664f74fc9fe0533ca245d75355695e5be.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits) Don't crash if Connections::target is changed by one of its signal handlers Update visual tests after some painter updates. Add missing Q_DISABLE_COPYs. Use Q_DECLARE_PRIVATE for private slot. Workaround no longer needed. Rename QDeclarativeExpression::value() to evaluate(). Continue to register base type. Doc. Remove the deprecated wrap property. Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest ...
Diffstat (limited to 'doc/doc.pri')
0 files changed, 0 insertions, 0 deletions