summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replace gluOrtho2d with glOrtho.Bjørn Erik Nilsen2010-08-101-1/+1
* Optimize QSharedPointer::operator=(const QSharedPointer &)Olivier Goffart2010-08-101-1/+7
* Make selection work across ligaturesJiang Jiang2010-08-101-21/+43
* Fix compilation on 64-bit Windows.Kim Motoyoshi Kalland2010-08-101-25/+8
* Fix documentation for QAccessible::InterfaceFactoryJan-Arve Sæther2010-08-102-6/+15
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-1055-59/+66
|\
| * 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-1 into master...Qt Continuous Integration System2010-08-109-4695/+2246
|\ \
| * | qmake: repair .vcxproj generationJoerg Bornemann2010-08-103-15/+17
| * | qmake: move .vcproj XML generation from data classes to VCProjectWriterJoerg Bornemann2010-08-102-203/+189
| * | qmake: remove duplicated code from VcxprojGeneratorJoerg Bornemann2010-08-103-595/+28
| * | qmake: duplicated code removed from msbuild_objectmodel.cppJoerg Bornemann2010-08-106-2638/+1060
| * | qmake: move XML generating code from data classes to VCXProjectWriterJoerg Bornemann2010-08-103-497/+431
| * | qmake vcxproj generator: introduce VCXProjectWriterJoerg Bornemann2010-08-107-574/+585
| * | qmake vcproj generator: introduce VCProjectWriterJoerg Bornemann2010-08-104-397/+398
| * | qmake: fix misuse of static_cast in msvc_vcproj.cppJoerg Bornemann2010-08-101-2/+7
| * | qmake: remove some old .dsp related code from .vcproj generatorJoerg Bornemann2010-08-102-81/+28
| * | qmake: remove Windows CE stuff from .vcxproj generatorJoerg Bornemann2010-08-103-149/+4
| * | qmake: remove VS2003 work-around from vcxproj generatorJoerg Bornemann2010-08-103-6/+3
| * | qmake: no need to add the _WINDOWS define twiceJoerg Bornemann2010-08-102-12/+0
| * | qmake: useless addition of the NDEBUG define removedJoerg Bornemann2010-08-102-4/+0
| * | qmake: don't add QT_NO_DEBUG in msvc generatorsJoerg Bornemann2010-08-102-6/+2
| * | qmake msvc generator: remove unneeded handling of variablesJoerg Bornemann2010-08-102-24/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-103-0/+94
|\ \ \ | | |/ | |/|
| * | 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