summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of ../qt-doc-team-licenses into 4.7David Boddie2010-10-04586-2930/+2930
|\
| * Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-04586-2930/+2930
* | Doc: Made documentation for Qt::TextLongestVariant public.David Boddie2010-10-041-7/+9
|/
* Doc: Made a number of fixes to the documentation.David Boddie2010-10-049-18/+66
* Doc: Removed a superfluous comment.David Boddie2010-10-041-1/+0
* Doc: Shorten lists of basic QML types.David Boddie2010-09-302-22/+11
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-30285-6654/+16375
|\
| * Doc: Implementing new doc search dialog.Morten Engvoldsen2010-09-293-88/+152
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2845-4601/+679
| |\
| | * 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
| | | |\
| | | * \ 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' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-4/+3
| |\ \ \ \ \ \
| | * | | | | | Doc: fixing slim fit style - search box.Morten Engvoldsen2010-09-281-4/+3
| * | | | | | | Doc: add style to new search resultsMorten Engvoldsen2010-09-281-1/+79
| * | | | | | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-28129-668/+2199
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-09-281-0/+39
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-28125-634/+2144
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Doc: Added lisence header to snippetGeir Vattekar2010-09-281-0/+39
| | * | | | | | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-282-34/+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/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
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-276-45/+54
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Moved the partial deployment section to qbase.pri.axis2010-09-274-45/+17
| | | | * | | Made the Symbian menu close when switching native focus.axis2010-09-272-0/+37
| | | |/ / /
| | | * | | Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-2714-11/+164
| | | |\ \ \ | | | | |/ /
| | | | * | Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
| | | | * | Fix test.Michael Brasser2010-09-271-0/+4
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2612-10/+152
| | | | |\ \ | | | |/ / /
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2612-10/+152
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2412-10/+152
| | | | | |\ \
| | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2412-10/+152
| | | | | | |\ \
| | | | | | | * | Small fixes to Browser.qmlJoona Petrell2010-09-241-7/+41
| | | | | | | * | More declarative autotests.Michael Brasser2010-09-2410-2/+110
| | | | | | | * | Fix example.Michael Brasser2010-09-241-1/+1
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-265-55/+71
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-261-8/+11
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | QHostInfo: Fix a crash when a new request is pushed while resolving.Jocelyn Turcotte2010-09-261-8/+11
| | | |/ / / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-264-47/+60
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |