summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-30 23:34:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-30 23:34:55 (GMT)
commit0492f2249395ed4f8d86775aee18ffeb195b30b4 (patch)
treea27cc932fc8c3dc9de75a1a187c0f46a0d879fe5 /dist
parentffd14464a6c5158c1b88b9cfa51e44507fb557f9 (diff)
parentcfe198948f1e4867918176df38b3e0b49757a4b8 (diff)
downloadQt-0492f2249395ed4f8d86775aee18ffeb195b30b4.zip
Qt-0492f2249395ed4f8d86775aee18ffeb195b30b4.tar.gz
Qt-0492f2249395ed4f8d86775aee18ffeb195b30b4.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: (31 commits) QDeclarativeDebug: Make autotests more robust Add sendParentChangeNotification to QGraphicsItem Use setParentItem() instead of setParentItemHelper if componentComplete is true QDeclarativeDebugClient: Make sure status is consistent Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning ...
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions