summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-247-121/+588
|\
| * Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL.Liang Qi2010-04-231-0/+1
| * Stub implementations for EGL for symbianShane Kearns2010-04-237-121/+587
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-231-25/+24
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7Janne Koskinen2010-04-231345-6483/+15930
| |\ \
| * | | DEF file fixJanne Koskinen2010-04-231-25/+24
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-235-82/+327
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into 4.7aavit2010-04-234-79/+317
| |\ \ \ \
| | * | | | Avoided O(n^2) behavior in painter path clipper.Samuel Rødal2010-04-231-68/+276
| | * | | | QTabBar: Widgets inside the tab bar where not properly laid out after moveTab()Gabriel de Dietrich2010-04-233-11/+41
| * | | | | Optimization: Avoid data copy when reading jpegs from memoryaavit2010-04-231-3/+10
| |/ / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-233-16/+42
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-231-2/+11
| |\ \ \ \
| | * | | | Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)Prasanth Ullattil2010-04-231-2/+11
| * | | | | qdoc: Removed nested <ul> elements from the TOCMartin Smith2010-04-231-13/+30
| |/ / / /
| * | | | Cocoa: quiting the app from the menubar may cause a crashRichard Moe Gustavsen2010-04-231-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-231-1/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-221-1/+27
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-221-1/+27
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | QtWebkit WINS DEF file freezeJanne Koskinen2010-04-221-1/+27
* | | | | | 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