summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2327-1025/+379
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2227-1025/+379
| |\
| | * Try to use multisampled opengl graphicssystem on all platformsTom Cooksey2010-04-221-0/+1
| | * Make sure recreateEglSurface creates a surface if there isn't oneTom Cooksey2010-04-223-14/+14
| | * QX11GL: Implement QX11GLWindowSurface::grabWidgetTom Cooksey2010-04-222-0/+47
| | * QX11GL: Cleanup the window surface & remove some synchronisationTom Cooksey2010-04-222-53/+47
| | * QX11GL: Move the shared context ownership into a seperate classTom Cooksey2010-04-223-101/+148
| | * QX11GL: Don't do glFinish in endPaintTom Cooksey2010-04-222-7/+0
| | * Implement QGLPaintDevice::metric()Tom Cooksey2010-04-222-0/+17
| | * Remove dead code left after a merge conflict resolutionTom Cooksey2010-04-222-22/+0
| | * Fixed autotest failures in tst_QPainterPath.Samuel Rødal2010-04-222-8/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2212-828/+111
| | |\
| | | * Removed bezier intersection code in path clipper.Samuel Rødal2010-04-228-825/+98
| | | * Diagram scene example (graphicsview/diagramscene) refresh problem.Bjørn Erik Nilsen2010-04-221-0/+1
| | | * When using Qt::BypassGraphicsProxyWidget with QMenu the application is not st...Alexis Menard2010-04-223-3/+12
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-231213-4348/+13316
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2393-1130/+1994
| |\ \ \
| | * | | Update visual tests after some painter updates.Michael Brasser2010-04-222-83/+83
| | * | | Add missing Q_DISABLE_COPYs.Michael Brasser2010-04-225-0/+8
| | * | | Use Q_DECLARE_PRIVATE for private slot.Michael Brasser2010-04-223-7/+7
| | * | | Workaround no longer needed.Michael Brasser2010-04-221-3/+1
| | * | | Rename QDeclarativeExpression::value() to evaluate().Michael Brasser2010-04-2216-60/+61
| | * | | Continue to register base type.Michael Brasser2010-04-221-0/+1
| | * | | Doc.Michael Brasser2010-04-221-18/+20
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221198-4147/+13074
| | |\ \ \ | |/ / / / |/| | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-221198-4147/+13074
| | |\ \ \ | | | |/ / | | |/| |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-226-13/+46
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | qdoc: Updated the extra images variable again, for each manual.qdocconf.Martin Smith2010-04-225-10/+43
| * | | | Revert "Add new QDataStream version for Qt 4.8."Jason McDonald2010-04-221-4/+3
| * | | | Add new QDataStream version for Qt 4.8.Jason McDonald2010-04-221-3/+4
| * | | | Fix URL for Qt Bug Tracker.Jason McDonald2010-04-221-3/+3
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2264-954/+1775
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2164-954/+1775
| |\ \ \
| | * | | Cocoa: fix namespace build breakageRichard Moe Gustavsen2010-04-211-1/+6
| | * | | Trivial doc fixHarald Fernengel2010-04-211-0/+1
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-2113-25/+62
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2158-949/+1608
| | | |\ \ \
| | | | * | | Cocoa: cocoa sometimes show a hidden windowRichard Moe Gustavsen2010-04-211-0/+11
| | | | * | | Default (Parentless) QMenuBar actions do not work (without autotest)Richard Moe Gustavsen2010-04-211-4/+15
| | * | | | | qdoc: Updated the extra images variable for each manual.qdocconf.Martin Smith2010-04-214-4/+160
| | | |/ / / | | |/| | |
| | * | | | Reorganised double stream out operator in QDataStream to avoid causing unnece...James Larcombe2010-04-211-3/+4
| | * | | | Revert "Report the error as being AlreadyExists if this is why it fails"Morten Johan Sørvig2010-04-213-32/+3
| | * | | | Revert "Default (Parentless) QMenuBar actions do not work"Morten Johan Sørvig2010-04-214-77/+15
| | * | | | fix memory bugLorn Potter2010-04-211-3/+1
| | * | | | fix nativeFilePath character width issueOswald Buddenhagen2010-04-201-3/+5
| | * | | | fix typosOswald Buddenhagen2010-04-207-7/+7
| | * | | | Just use the path as the url can have an anchor attached etc...kh12010-04-202-4/+5
| | * | | | Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-202-73/+68
| | * | | | Default (Parentless) QMenuBar actions do not workRichard Moe Gustavsen2010-04-204-15/+77
| | * | | | Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCoreKent Hansen2010-04-203-10/+59