summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix VisualDataModel model update handling when rootIndex is specified.Martin Jones2010-08-273-12/+80
* Improve test reliability when running in parallel with other tests.Martin Jones2010-08-271-0/+9
* Improve stability of test on loaded hw.Martin Jones2010-08-271-0/+1
* Improve stability of test on loaded hw.Martin Jones2010-08-271-1/+1
* Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2010-08-2614-29/+85
|\
| * 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-qml into 4.7-integrationQt Continuous Integration System2010-08-2644-63/+213
|\ \ \ \ | |/ / / |/| | |
| * | | Handle layoutChanged() properly in QML views.Martin Jones2010-08-263-1/+10
| * | | Fix ListView and GridView tests following off-by-one fixes.Martin Jones2010-08-262-3/+3
| * | | Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7acMartin Jones2010-08-261-2/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2629-30/+102
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
| | |\ \ \
| | | * | | Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| | * | | | Make declarative examples a bit more qt-like.Yann Bodson2010-08-2619-10/+10
| | |/ / /
| * | | | Fix off-by-one at end when views scroll to keep currentItem visible.Martin Jones2010-08-262-13/+13
| |/ / /
| * | | ListView.view and GridView.view properties should not be writable.Martin Jones2010-08-262-2/+2
| * | | Avoid Flickable view jumping when drag threashold is exceeded.Martin Jones2010-08-262-2/+9
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-261-2/+0
| |\ \ \
| | * | | Remove dead code.Michael Brasser2010-08-261-2/+0
| * | | | Fix ListView.view attached property with VisualItemModelMartin Jones2010-08-266-9/+26
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-3/+0
| |\ \ \
| | * | | Remove unused code.Michael Brasser2010-08-251-3/+0