summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-195-23/+45
|\
| * Fix compilation with Sun Studio 12.1.Thiago Macieira2010-11-191-2/+2
| * Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| * silence compiler warningsHarald Fernengel2010-11-192-7/+7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-181-14/+34
| |\
| | * Don't let posted events starve native dialogs (regression)Bradley T. Hughes2010-11-181-14/+34
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-1911-13/+45
|\ \ \ | |/ / |/| |
| * | Move qmlvisualaids to another repoAlan Alpert2010-11-199-391/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-197-10/+32
| |\ \
| | * | Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
| | * | Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | * | Add missing symbols to QtOpenGL arm def fileJoona Petrell2010-11-191-0/+5
| | * | Add missing symbols to QtOpenGL emulator def fileJoona Petrell2010-11-191-3/+8
| | * | Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
| * | | Initial commit of qmlvisualaidsAlan Alpert2010-11-199-0/+391
| * | | Add a test on QWSAlan Alpert2010-11-182-3/+5
| |/ /
| * | Fix parent bug for QDeclarativeOpenMetaObjectMarco Bubke2010-11-181-0/+2
| * | Add missing symbols in QtGui emulator def fileJoona Petrell2010-11-181-0/+6
|/ /
* | 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 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
| |/ |/|
* | 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' 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