summaryrefslogtreecommitdiffstats
path: root/src
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-234-82/+292
|\
| * Merge remote branch 'origin/4.7' into 4.7aavit2010-04-233-79/+282
| |\
| | * 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-232-11/+6
| * | 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-232-3/+12
|\ \
| * | Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)Prasanth Ullattil2010-04-231-2/+11
| * | Cocoa: quiting the app from the menubar may cause a crashRichard Moe Gustavsen2010-04-231-1/+1
| * | 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
* | | 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
| |\ \ | | |/ | |/|
| | * 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-2324-974/+378
|\ \ \
| * | | 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-221-7/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-2210-778/+110
| |\ \ \ | | |/ / | |/| |
| | * | Removed bezier intersection code in path clipper.Samuel Rødal2010-04-227-775/+98
| | * | 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.7Martin Jones2010-04-2351-437/+665
|\ \ \ \
| * | | | 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-2211-35/+36
| * | | | 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-22131-1677/+2656
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2231-374/+592
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2131-374/+592
| | |\ \ \
| | | * | | Cocoa: fix namespace build breakageRichard Moe Gustavsen2010-04-211-1/+6
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-2130-373/+586
| | | |\ \ \
| | | | * | | 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
| | | | * | | 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-212-7/+3
| | | | * | | Revert "Default (Parentless) QMenuBar actions do not work"Morten Johan Sørvig2010-04-211-15/+4
| | | | * | | fix memory bugLorn Potter2010-04-211-3/+1
| | | | * | | fix nativeFilePath character width issueOswald Buddenhagen2010-04-201-3/+5
| | | | * | | fix typosOswald Buddenhagen2010-04-202-2/+2
| | | | * | | Default (Parentless) QMenuBar actions do not workRichard Moe Gustavsen2010-04-201-4/+15
| | | | * | | Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCoreKent Hansen2010-04-203-10/+59
| | | | * | | Improve itemview appearance on MacJens Bache-Wiig2010-04-201-5/+11
| | | | * | | ScrollBar width not updated dynamically on Windows.Prasanth Ullattil2010-04-202-0/+26