summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add sendParentChangeNotification to QGraphicsItemMarco Bubke2010-09-302-4/+16
* Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-09-302-9/+34
* QDeclarativeDebugClient: Make sure status is consistentKai Koehne2010-09-303-3/+8
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-301142-2030/+2776
|\
| * Revert "QDeclarativeDebugService: Add bc autotest" to get changes through sta...Joona Petrell2010-09-303-95/+2
| * Doc clarification.Michael Brasser2010-09-301-0/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-292-181/+269
| |\
| | * Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4...Joona Petrell2010-09-292-181/+269
| * | Fallback to A8 text rendering on Mac when LCD smoothing is disabledAaron Kennedy2010-09-291-0/+7
| |/
| * Autotest that new "import Qt 4.7"s aren't added accidentallyAaron Kennedy2010-09-291-0/+57
| * Document "import QtQuick 1.0" changeAaron Kennedy2010-09-292-0/+56
| * Replace "import Qt 4.7" with "import QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-296-176/+132
| |\
| | * Correct property type of PathAttribute::value in the docs.Michael Brasser2010-09-291-1/+1
| | * Remove unused AST node destructors.Michael Brasser2010-09-281-146/+3
| | * Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-09-283-1/+26
| | * Documentation.Michael Brasser2010-09-282-24/+98
| | * Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-281-4/+4
| * | Add test for Qt 4.7 moduleAaron Kennedy2010-09-295-1/+183
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291101-1424/+1424
| * | Register QtQuick 1.0 module.Aaron Kennedy2010-09-295-31/+146
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2828-220/+596
| |\
| | * QDeclarativeDebugClient: Fix gcc warningKai Koehne2010-09-281-1/+1
| | * QmlDebugService: Check that there is a receiver before sending messagesKai Koehne2010-09-281-2/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-281-1/+4
| | |\
| | | * QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
| | | * QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
| | * | If a type is registered under several names, share the attached property objectAaron Kennedy2010-09-289-10/+62
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-2814-182/+457
| | |\ \ | | | |/
| | | * QDeclarativeDebugService: Add bc autotestKai Koehne2010-09-283-2/+95
| | | * Make QmlDebug protocol more robustKai Koehne2010-09-2812-180/+362
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-2888-509/+1544
| | |\ \ | | | |/
| | * | Minimize parameter changes on glyph cache texturesAaron Kennedy2010-09-283-5/+32
| | * | Only set maskTexture sampler uniform onceAaron Kennedy2010-09-282-6/+13
| | * | Only repopulate the glyph cache when we know something could have changedAaron Kennedy2010-09-281-11/+16
| | * | Remove unnecessary attribute changesAaron Kennedy2010-09-231-2/+0
| | * | Invalidate QStaticText coord cache when texture size changesAaron Kennedy2010-09-231-1/+8
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-3054-69/+170564
|\ \ \ \
| * | | | Add declarative changelog entries for 4.7.1Joona Petrell2010-09-301-0/+92
| * | | | connman backendLorn Potter2010-09-301-0/+1
| * | | | My changelog entries for 4.7.1Markus Goetz2010-09-291-0/+4
| * | | | updated changes-4.7.1Joerg Bornemann2010-09-291-0/+12
| * | | | Update frameGeometry when the unified toolbar visiblity is toggledAndy Shaw2010-09-292-0/+20
| * | | | Update changelogOlivier Goffart2010-09-291-0/+24
| * | | | my contributions to dist/changes-4.7.1Bradley T. Hughes2010-09-291-1/+7
| * | | | My 4.7.1 changes.Trond Kjernåsen2010-09-291-2/+11
| * | | | added my and Jan-Arve's change to changelog for 4.7.1Thierry Bastian2010-09-291-0/+11
| * | | | Changes done for 4.7.1Prasanth Ullattil2010-09-291-0/+4
| * | | | Updated changes-4.7.1Samuel Rødal2010-09-291-1/+4
| * | | | My changes.Aaron McCarthy2010-09-291-0/+2