summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replace gluPerspective with qgluPerspective.Bjørn Erik Nilsen2010-08-104-2/+14
* Remove dependency of OpenGL Utility Library (GLU).Bjørn Erik Nilsen2010-08-1051-57/+52
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-103-0/+94
|\
| * Added QPainter::clipBoundingRect() which is significantly fasterGunnar Sletta2010-08-093-0/+94
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-08-102-36/+41
|\ \
| * | Are custom file engines in use?João Abecasis2010-08-091-3/+10
| * | Make prefix handling in file engine creation more robustJoão Abecasis2010-08-091-5/+21
| * | Fix minor premature pessimizations in file engine creationJoão Abecasis2010-08-091-9/+7
| * | There goes QResourceFileEngineHandlerJoão Abecasis2010-08-092-23/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-060-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jan-Arve Sæther2010-08-061008-9853/+21317
| |\ | |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-06261-1603/+1471
|\ \
| * | Compile.Yoann Lopes2010-08-061-1/+1
| * | Fix recursion in QScriptEngine::toScriptValueOlivier Goffart2010-08-061-1/+1
| * | Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4Olivier Goffart2010-08-062-7/+9
| * | Remove usage of deprecated QScriptValue* functionOlivier Goffart2010-08-068-20/+20
| * | Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromV...Olivier Goffart2010-08-062-23/+31
| * | Remove the use of deprecated qVariant*Olivier Goffart2010-08-06151-807/+807
| * | Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValueOlivier Goffart2010-08-062-21/+19
| * | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-0665-179/+179
| * | Deprecated qFindChild and qFindChildrenOlivier Goffart2010-08-062-34/+37
| * | Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded charEskil Abrahamsen Blomfeldt2010-08-066-2/+61
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-0651-518/+316
| |\ \
| | * | tst_qsharedpointer.cpp: fix compilationOlivier Goffart2010-08-041-2/+0
| | * | Fix compilation with QT_NO_DEBUG_STREAMOlivier Goffart2010-08-041-3/+0
| | * | QImage::fill() overloads that take QColor and Qt::GlobalColorGunnar Sletta2010-08-043-0/+198
| | * | qmake: qmakeDeleteCacheClear() function can be template nowminiak2010-08-034-11/+8
| | * | It is no longer necessary to check for QT_NO_MEMBER_TEMPLATESminiak2010-08-0315-56/+9
| | * | It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATIONminiak2010-08-036-44/+2
| | * | Fix MS Visual C++ 6.0 references in the documentationminiak2010-08-034-76/+62
| | * | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-0325-326/+37
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-08-061-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Cocoa: add better support for delayed message invocationRichard Moe Gustavsen2010-08-061-2/+6
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-08-058-0/+1579
|\ \ \ \ | |/ / /
| * | | Add benchmarks for QtScript's QObject bindingKent Hansen2010-08-052-0/+1244
| * | | Add benchmarks for QMetaType::construct(int type, void *copy = 0)Kent Hansen2010-08-053-0/+171
| * | | Add benchmarks for QVariant(int type, void *copy = 0)Kent Hansen2010-08-053-0/+164
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-035-6/+62
|\ \ \ | |/ /
| * | 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
| | | |\ \