summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-0325-326/+37
* Fix the issue of resizing a window with theFabien Freling2010-08-031-2/+16
* Add QTextFragment::glyphs() accessorEskil Abrahamsen Blomfeldt2010-08-024-4/+46
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-07-301-1/+1
|\
| * Minor optimizationSimon Hausmann2010-07-301-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-301-2/+0
|\ \ | |/ |/|
| * tst_qgl: enable back on macOlivier Goffart2010-07-301-2/+0
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-292-0/+31
|\ \ | |/
| * Setting a timeSpec on QDateTimeEdit breaks the edit when only time is shownFrederik Gladhorn2010-07-292-0/+31
|/
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-07-29751-8146/+18110
|\
| * Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-28751-8146/+18110
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-2810-122/+220
| | |\
| | | * Merge commit '9814b2225b70d6b2f758e9dbe98f8e1662049b37' into oslo-staging-1Aaron McCarthy2010-07-2810-122/+220
| | | |\
| | | | * Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | * Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | * Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | * Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| | | | * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-286-53/+104
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-281-16/+40
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-07-271-16/+40
| | | |\ \ \
| | | | * | | Make tst_qdatetime failures more verbose.Rohan McGovern2010-07-271-16/+40
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-281-1/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Make it possible again to build Qt without webkitSimon Hausmann2010-07-271-1/+0
| | | |/ / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-2764-157/+278
| | |\ \ \ \
| | | * | | | Adding missing imageKevin Wright2010-07-271-0/+0
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-07-2764-157/+278
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix QT_NO_DATESTRINGTasuku Suzuki2010-07-275-13/+13
| | | | * | | Check the gesturemanager pointer before accessing it.Denis Dzyubenko2010-07-273-9/+12
| | | | * | | Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 int...Kevin Wright2010-07-2752-79/+809
| | | | |\ \ \
| | | | | * \ \ Merge commit 'c16f0a839743af36b36aea9c35f0d5ddfda3d6ac' into oslo-staging-1Aaron McCarthy2010-07-274-8/+32
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| / | | | | | | |/
| | | | | | * Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-272-4/+13
| | | | | | * Fix typo in docs.Aaron McCarthy2010-07-271-1/+1
| | | | | | * Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
| | | | | | * Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
| | | | * | | Added files that had been renamed.Kevin Wright2010-07-2728-0/+1605
| | | | * | | Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-07-2737-1623/+30
| | | | * | | Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-2613-80/+162
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-2716-97/+389
| | |\ \ \ \ \
| | | * | | | | Don't run the QGL test on systems that does not have GL support.Trond Kjernåsen2010-07-271-1/+26
| | | * | | | | Remove an useless assert from comp_func_SourceOver_sse2()Benjamin Poulain2010-07-271-1/+0
| | | * | | | | QScriptEngineAgent: recompile all the function when installing a debugger.Olivier Goffart2010-07-274-6/+58
| | | * | | | | QScriptDeclarativeObject: we need to save the current stack pointer.Olivier Goffart2010-07-271-2/+2
| | | * | | | | QScriptValue::objectId(): do not assert if the value is not a cellOlivier Goffart2010-07-271-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-07-279-86/+302
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Implement the composition mode "Plus" with SSE2Benjamin Poulain2010-07-274-9/+94
| | | | * | | | Clean the CompositionFunction tables of drawhelperBenjamin Poulain2010-07-277-77/+208
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-07-277-14/+42
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fix signal emission of QDesktopWidget on Symbian.Jason Barron2010-07-271-6/+16
| | | * | | | | Fixed gcce linker error when linking against s60main built by armcc.axis2010-07-271-0/+1