summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Jan-Arve Sæther2010-11-19492-13564/+10867
|\
| * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-1817-584/+560
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1815-564/+540
| | |\
| | | * Fine-tune the tests being run on the CI system.Alan Alpert2010-11-181-36/+10
| | | * Standardize selection color in visual testAlan Alpert2010-11-1814-528/+530
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-182-20/+20
| | |\ \ | | | |/ | | |/|
| | | * Use GLIBC functions on any GLIBC architecture.Oswald Buddenhagen2010-11-171-3/+3
| | | * tst_qnetworkreply: Fix ugly testMarkus Goetz2010-11-171-17/+17
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-180-0/+0
| |\ \ \
| | * | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envsSami Merila2010-11-183-3/+3
| * | | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envsSami Merila2010-11-183-3/+3
| |/ / /
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-11-18390-12069/+9055
| |\ \ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-17390-12069/+9055
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-174-19/+18
| | | |\ \ | | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-174-19/+18
| | | | |\ | | | |/ /
| | | | * Fix license text.Jason McDonald2010-11-173-18/+17
| | | | * Doc: fix a typo in QML/Qt UI integrationPierre Rossi2010-11-161-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-17386-12050/+9037
| | | |\ \ | | | | |/ | | | |/|
| | | | * Remove pointSize from visual testsAlan Alpert2010-11-173-2/+2
| | | | * Update visuals for X11Alan Alpert2010-11-1741-1404/+1404
| | | | * Added missing symbols in QtCore and QtGui def files needed by fix made to QT-...Joona Petrell2010-11-162-1/+4
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-162-0/+3
| | | | |\
| | | | | * Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| | | | * | Remove some excess pngsAlan Alpert2010-11-1615-0/+0
| | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-1635-145/+206
| | | | |\
| | | | | * VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-162-0/+26
| | | | | * Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| | | | |/ | | | |/|
| | | | * Update qml visual testsAlan Alpert2010-11-16358-11891/+8848
| | | | * Record images on more than just the first frame.Alan Alpert2010-11-161-1/+1
| | | | * Turn off font antialiasing during tests.Alan Alpert2010-11-166-13/+12
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-1613-35/+50
| | | | |\
| | | | * | Shrink size of a visual testAlan Alpert2010-11-163-110/+110
| * | | | | QToolbar should fill available width on SymbianSami Merila2010-11-181-0/+50
| |/ / / /
| * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-161-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-161-1/+1
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-151-1/+1
| | | |\ \ \ | | |/ / / /
| | | * | | doc: Fix documentation of QTextEdit::setDocumentEskil Abrahamsen Blomfeldt2010-11-151-1/+1
| * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-15193-1594/+1885
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-153-3/+12
| | |\ \ \ \
| | | * | | | Fixed QGesture autotest for QGesture lazy deletion.Dominik Holland2010-11-151-1/+3
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-152-2/+9
| | | |\ \ \ \
| | | | * | | | Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-122-2/+9
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-1528-140/+167
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-153-9/+6
| | | |\ \ \ \ \
| | | | * | | | | compile with quintptr instead of intptr_tThiago Macieira2010-11-151-1/+1
| | | | * | | | | Enable OpenGL scissors testAdrian Constantin2010-11-151-3/+0
| | | | * | | | | Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, ad...Petri Latvala2010-11-151-2/+2
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7stagingVille Pernu2010-11-1530-191/+452
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7stagingVille Pernu2010-11-120-0/+0
| | | | |\ \ \ \ \ \
| | | | * | | | | | | qmake vcxproj generator: fix description of custom build toolsJoerg Bornemann2010-11-121-1/+1