summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | 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
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Add test for VisualItemModel layoutChanged() handlingMartin Jones2010-08-252-0/+50
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-254-5/+66
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Handle QAbstractItemModel layoutChanged() signalMartin Jones2010-08-251-0/+2
* | | | | | | | | | | | 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