summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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-upstream' into 4.7-docA-Team2010-09-2495-501/+1824
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | * | Updated changes-4.7.1.Kim Motoyoshi Kalland2010-09-241-1/+3
| | * | Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-243-7/+7
| | * | Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-241-1/+2
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-245-8/+23
| |\ \
| | * | Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| | * | Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-244-114/+125
| |\ \
| | * | Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-232-61/+79
| | * | Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-232-24/+39
| | * | Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-232-29/+7
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-247-34/+98
| |\ \ \ | | |_|/ | |/| |
| | * | Disallow patching capabilities of executablesMiikka Heikkinen2010-09-232-17/+33
| | * | Merge branch 'eventStarvationFixes' into 4.7-s60axis2010-09-234-16/+59
| | |\ \
| | | * | Made it more clear what the okToRun function does by renaming it.axis2010-09-232-12/+12
| | | * | Fixed event starvation on Symbian if timers were constantly recreatedaxis2010-09-233-4/+17
| | | * | Fixed deployment when using shadow builds.axis2010-09-231-1/+1
| | | * | Marked a test as XFAIL on Symbian.axis2010-09-231-0/+4
| | | * | Made posted events part of the round robin queue.axis2010-09-233-6/+32
| | * | | Avoid OpenVG rendering errors when stroking an aliased path.Jason Barron2010-09-231-1/+6