summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-294-176/+107
|\
| * 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-281-1/+1
| * Documentation.Michael Brasser2010-09-282-24/+98
| * Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-281-4/+4
* | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-2913-17/+17
* | Register QtQuick 1.0 module.Aaron Kennedy2010-09-294-31/+145
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2817-148/+411
|\
| * QDeclarativeDebugClient: Fix gcc warningKai Koehne2010-09-281-1/+1
| * QmlDebugService: Check that there is a receiver before sending messagesKai Koehne2010-09-281-2/+4
| * If a type is registered under several names, share the attached property objectAaron Kennedy2010-09-286-10/+34
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-287-111/+304
| |\
| | * Make QmlDebug protocol more robustKai Koehne2010-09-287-111/+304
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-2852-374/+824
| |\ \ | | |/
| * | 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-2848-4609/+691
|\ \ \ | |_|/ |/| |
| * | Fix compile warnings (unused variables).Aaron McCarthy2010-09-282-1/+9
| * | Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2843-4595/+650
| * | Closes properly the dbus connection in icd backendAaron McCarthy2010-09-281-0/+2
| * | Connect/Disconnect requests needs to use the same dbus connection to ICD for ...Aaron McCarthy2010-09-282-5/+6
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-274-8/+24
| |\ \
| | * \ Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-273-2/+13
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-261-8/+11
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2459-410/+1006
| | |\ \ \ \
| | * | | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2437-258/+234
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2237-258/+234
| | | |\ \ \ \ \
| | * | | | | | | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
| | * | | | | | | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
| | |/ / / / / /
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-215-13/+40
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2029-251/+742
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-201-3/+4
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Jerome Pasion2010-09-2054-3632/+1690
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| * | | | | | | | | | | Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Moved the partial deployment section to qbase.pri.axis2010-09-274-45/+17
* | | | | | | | | | | Made the Symbian menu close when switching native focus.axis2010-09-271-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
* | | | | | | | | | Fix test.Michael Brasser2010-09-271-0/+4