summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed QPixmap::resize() for X11 pixmap with masks.Trond Kjernåsen2010-09-231-9/+14
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2319-117/+493
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2319-117/+493
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2219-117/+493
| | |\
| | | * QPainter not restored correctly in Graphics View.Bjørn Erik Nilsen2010-09-223-6/+47
| | | * Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShapeBjørn Erik Nilsen2010-09-222-45/+267
| | | * Fix compilationOlivier Goffart2010-09-221-2/+2
| | | * Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.Trond Kjernåsen2010-09-226-2/+22
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2210-64/+157
| | | |\
| | | | * Fix warning on MSVCOlivier Goffart2010-09-221-1/+1
| | | | * QThread: make sure start works even if called after exitOlivier Goffart2010-09-223-0/+45
| | | | * Revert "Fixed painter path drawing on FBO without stencil buffer."Kim Motoyoshi Kalland2010-09-222-30/+0
| | | | * Fix a crash with D&d on mingwThierry Bastian2010-09-221-6/+6
| | | | * Revert "Keep other text format with QTextOption::SuppressColors tag on"Jiang Jiang2010-09-221-6/+2
| | | | * Fixed stencil buffer on FBOs with OpenGL ES.Kim Motoyoshi Kalland2010-09-222-27/+79
| | | | * Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2010-09-221-2/+6
| | | | * QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-222-0/+26
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2322-180/+112
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Various declarative autotest additions.Michael Brasser2010-09-239-1/+96
| * | | | Update QtDeclarative def filesJoona Petrell2010-09-232-3/+7
| * | | | Fix ListModel::set() so the implementation and docs areBea Lam2010-09-232-3/+4
| * | | | Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
| * | | | Doc fix.Michael Brasser2010-09-231-1/+1
| * | | | Remove unused, unexported class.Michael Brasser2010-09-234-127/+0
| * | | | Remove dead code paths in declarative list model code.Michael Brasser2010-09-234-44/+0
| * | | | Properly cleanup in QDeclarativeModulePlugin test.Michael Brasser2010-09-231-0/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2316-15/+551
|\ \ \ \
| * | | | Move includes after copyright blockMartin Jones2010-09-221-5/+2
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2216-15/+554
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-224-0/+187
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-2216-15/+367
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-227-3/+140
| | | * | Update QtDeclarative def filesJoona Petrell2010-09-222-0/+167
| | | * | Add exports for BauhausThomas Hartmann2010-09-212-2/+2
| | | * | Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
| | | * | Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1
| | | * | Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-213-3/+44
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-211-2/+2
| | | |\ \
| | | | * | Small optimization for QDeclarativeVisualDataModel.Michael Brasser2010-09-211-2/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-221-10/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Qmake: Fix wrong path in the breakpad post link stepMarco Bubke2010-09-221-10/+9
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-227-58/+76
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | We also don't need to watch for org.freedesktop.DBus changing ownersThiago Macieira2010-09-221-0/+4
| * | | | Avoid adding match rules for NameAcquired and NameLostThiago Macieira2010-09-221-9/+17
| * | | | We don't need to add a match rule to receive messages targetted at us.Thiago Macieira2010-09-221-18/+0
| * | | | Save the D-Bus's base service earlier.Thiago Macieira2010-09-221-2/+4
| * | | | Pre-populate the watched services hash with org.freedesktop.DBusThiago Macieira2010-09-222-0/+7
| * | | | Quick performance optimisation: cache a QString with "org.freedesktop.DBus"Thiago Macieira2010-09-221-9/+17
| * | | | XML schema internals: fix memory leakPeter Hartmann2010-09-221-0/+1
| * | | | QNAM: Use QFileNetworkReply for qrc:/ URL schemaMisha Tyutyunik2010-09-222-3/+6