summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Documentation.Michael Brasser2010-09-282-24/+98
* Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-281-4/+4
* 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-2857-4653/+861
|\ \ \ | |_|/ |/| |
| * | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| * | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-09-281-0/+3
| |\ \
| | * | Doc: Fixing QTBUG-13595Morten Engvoldsen2010-09-281-0/+3
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2722-57/+220
| | |\ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-2857-4653/+819
| |\ \ \ |/ / / /
| * | | 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-2713-52/+152
| |\ \ \
| | * | | Added my changes to the changelog.axis2010-09-271-0/+12
| | * | | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-2714-11/+164
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-265-55/+71
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2495-501/+1824
| | |\ \ \ \
| | * | | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-242-0/+13
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2474-470/+655
| | | |\ \ \ \ \
| | | * | | | | | 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
| | * | | | | | | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-233-28/+28
| | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2271-442/+627
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-228-13/+46
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-218-13/+46
| | | |\ \ \ \ \ \
| | * | | | | | | | Doc: Added a note to qmake INSTALLS docsGeir Vattekar2010-09-221-0/+3
| | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2152-802/+12445
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2050-799/+12440
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'doc-4.7' into 4.7Morten Engvoldsen2010-09-201-3/+4
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ 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-20364-4131/+3265
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4