summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Work around an ATI driver problem with mutli-sampled pbuffers.Trond Kjernåsen2010-09-281-11/+18
* tst_qstatemachine.cpp: fix compilation with Sun StudioOlivier Goffart2010-09-281-1/+1
* Fixed regression in clipping.qps autotest on 64-bit.Samuel Rødal2010-09-281-1/+1
* Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.Trond Kjernåsen2010-09-281-9/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2813-79/+157
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2713-79/+157
| |\
| | * Fixed performance regression in curve stroking.Samuel Rødal2010-09-273-6/+8
| | * Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-272-7/+29
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-09-27183-972/+2671
| | |\
| | | * Doc update for the support of MSVC 2010 64-bitThierry Bastian2010-09-271-2/+3
| | | * Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-275-4/+10
| | | |\
| | | | * fix documentation of drawText(int, int, int, int, ...Gunnar Sletta2010-09-271-1/+1
| | | | * Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-274-3/+9
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-264-3/+9
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-244-3/+9
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-248-10/+29
| | | | | | | |\
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-243-2/+6
| | | | | | | | |\
| | | | | | | | | * Don't pretend to support single buffered EGL surfaces.Trond Kjernåsen2010-09-242-0/+4
| | | | | | | | | * Named anonymous struct in the OpenGL paint engine.Kim Motoyoshi Kalland2010-09-241-2/+2
| | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-2414-126/+253
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-236-86/+100
| | | | | | | |\ \ \
| | | | | | | * | | | Fixes gray_raster incorrectly reporting out of memory error.Yoann Lopes2010-09-231-1/+3
| | * | | | | | | | | Avoid creating copy of an image in memory when storing as pngaavit2010-09-272-47/+88
| | * | | | | | | | | Optimization of pixel conversion when storing jpegaavit2010-09-241-13/+19
* | | | | | | | | | | 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' 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' 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