summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-262-1/+15
|\
| * Added support for DEPLOYMENT.pkg_build_versionMiikka Heikkinen2010-08-261-0/+14
| * fix for memory leak in QSysInfo::s60Version()mread2010-08-261-1/+1
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-08-2612-28/+70
|\ \
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-2612-28/+70
| |\ \ |/ / /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-251-1/+1
| |\ \
| | * | WGL_COLOR_BITS_ARB should not take the alpha bits into account.Trond Kjernåsen2010-08-251-1/+1
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-241-0/+26
| |\ \
| | * | QNAM HTTP: Prepare a compression auto test related to a future bugfixMarkus Goetz2010-08-231-0/+26
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-241-1/+1
| |\ \ \
| | * | | Fix the broken unicode detection of ODBC driver.Charles Yin2010-08-241-1/+1
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-204-18/+17
| |\ \ \ | | |/ /
| | * | fix Norwegian Breakfast Network warnings in configureJoerg Bornemann2010-08-203-17/+16
| | * | fix shadow build of configure.exeJoerg Bornemann2010-08-201-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-181-1/+1
| |\ \ \ | | |/ /
| | * | fix epic fail from 4ba6646Joerg Bornemann2010-08-181-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-171-3/+6
| |\ \ \ | | |/ /
| | * | qmake: fix assertion on Windows when DESTDIR is empty in static libsJoerg Bornemann2010-08-171-3/+6
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-162-2/+11
| |\ \
| | * | Fix OpenGLVersionFlags on OpenGL 4.0 systemsRhys Weatherley2010-08-162-2/+11
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-131-0/+2
| |\ \ \ | | |/ /
| | * | Update changes-4.6.4 with recent shader program changesRhys Weatherley2010-08-131-0/+2
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-134-5/+16
| |\ \ \ | | |/ /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-08-132-1/+5
| | |\ \ | | |/ / | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-122-1/+5
| |\ \ \
| | * | | QNAM HTTP: Fix crash related to aborted uploadsMarkus Goetz2010-08-122-1/+5
| |/ / /
| | * | Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-134-5/+16
| |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-08-121-14/+17
| |\ \
| | * | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-08-121-14/+17
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-253-3/+13
|\ \ \ | | |/ | |/|
| * | Enabling AdvancedPointerEvents for active windows causes a panicSami Merila2010-08-253-3/+13
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-254-5/+66
|\ \
| * | Remove enums from bitfield, since all compilers do not support them.Janne Anttila2010-08-251-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-243-1/+62
| |\ \
| | * | Fixed compile error in runonphone.axis2010-08-241-0/+2
| | * | Use QImage 'convertInPlace' versions in QVGPixmapData load functions.Jani Hautakangas2010-08-242-1/+60
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2529-87/+635
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2513-67/+148
| |\ \ \
| | * | | Fix responseText to check the charset encoding field and also to notBea Lam2010-08-254-21/+110
| | * | | Re-insert and emit the correct NOTIFY signals following the removalBea Lam2010-08-254-2/+8
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-251-15/+7
| | |\ \ \
| | * | | | Alignment of shadow for rich text is broken when using text stylesYann Bodson2010-08-251-3/+3
| | * | | | typoYann Bodson2010-08-251-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2512-1/+463
| | |\ \ \ \
| | * | | | | Setting one dimension of the sourceSize should set the other dimension.Yann Bodson2010-08-253-40/+26
| |/ / / / / |/| | | | |
| * | | | | Don't circumvent onDestruction handlers when clearing expression in delegate ...Martin Jones2010-08-253-4/+17
| | |/ / / | |/| | |
| * | | | Fix poor flicking behavior with slower flicks.Martin Jones2010-08-251-15/+7
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2518-46/+260
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-2418-46/+260
|\ \ \ \ | |_|/ / |/| | |
| * | | Stabilize tst_qgraphicssceneOlivier Goffart2010-08-241-2/+2