summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | | | | | | | Doc: Fixing overlapping text problem in columnsMorten Engvoldsen2010-09-201-0/+1
| | |/ / / / / / / / /
| * | | | | | | | | | Doc: Added info on QWidget::render to printing docsGeir Vattekar2010-09-202-0/+65
| |/ / / / / / / / /
* | | | | | | | | | 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' 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix a compilation issue of tst_qsettings for win32-msvc.Liang Qi2010-09-241-0/+1
| * | | | | | | | | fix RSS listing examplePeter Hartmann2010-09-243-47/+59
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-2411-5/+332
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2411-5/+332
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-246-25/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | QML Debugging: Documentation fixesLasse Holmstedt2010-09-241-15/+3
| * | | | | | | | dist/changes: QML Debugging changesLasse Holmstedt2010-09-241-1/+5