summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-164-10/+134
* Fix test.Michael Brasser2010-09-161-2/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1531-59/+1179
|\
| * Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-153-8/+11
| * Fix Symbian def files for 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39Thomas Hartmann2010-09-152-0/+98
| * Fix Symbian def files for 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-0/+2
| * crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-09-152-4/+8
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1522-59/+1075
| | |\
| * | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | |/ | |/|
| * | Compile with QT_NO_GESTURES.Yann Bodson2010-09-151-0/+2
| * | Give file and line error information for errors in dummydata.Michael Brasser2010-09-151-5/+1
| * | Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-153-0/+106
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1420-54/+966
| |\ \
| | * | Export QDeclarativeScriptActionMarco Bubke2010-09-141-1/+1
| | * | Completing the interface for children/data/resourcesThomas Hartmann2010-09-146-4/+129
| | * | Unit tests for Bauhaus enablersThomas Hartmann2010-09-142-0/+166
| | * | This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-1411-49/+670
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-151-1/+3
|\ \ \ \
| * | | | fix error messages when configuring QtJoerg Bornemann2010-09-151-1/+3
| | |_|/ | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-151-6/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Do not wait for QThread exit when destroying global statics in SymbianMiikka Heikkinen2010-09-151-6/+29
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-151-2/+2
|\ \ \
| * | | Rename "interface" in qdeclarativeinterface.h to "qmlInterface"Rhys Weatherley2010-09-151-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-151-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix compile error with active perl 5.8.9Shane Kearns2010-09-141-2/+3
| * | | This patch enables calling createpackage script alsoJani Hautakangas2010-09-141-2/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-142-2/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | fix QTBUG-13501 - crash when a gesture is accepted but not consumedJeremy Katz2010-09-141-2/+4
| * | | Add test: assert when gesture is never accepted.Frederik Gladhorn2010-09-141-0/+26
| | |/ | |/|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-145-5/+34
|\ \ \ | |_|/ |/| |
| * | QGraphicsWidget update issues with ItemHasNoContents + effectBjørn Erik Nilsen2010-09-142-2/+32
| * | Fixed missing background for regular Qt applications with MeeGo system.Samuel Rødal2010-09-141-1/+0
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-142-2/+2
| |\ \
| | * | Fix top-left corner of rounded rects in QPaintEngineExGunnar Sletta2010-09-142-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-147-46/+1427
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'buildSystemFixes' into 4.7-s60axis2010-09-143-16/+18
| |\ \ \
| | * | | Fixed audio-backend detection in configure tests.axis2010-09-141-0/+2
| | * | | Added support for using -L notation in the LIBS variable.axis2010-09-141-4/+10
| | * | | Eliminated duplicated code from library handling.axis2010-09-141-16/+10
| | * | | Moved the sis_targets feature profile to the correct directory.axis2010-09-101-0/+0
| * | | | Remove redundant code in SgImage -> VGImage conversion on Symbian.Jason Barron2010-09-141-29/+2
| * | | | Fix incorrect dialog positioning on SymbianGareth Stockwell2010-09-141-1/+1
| * | | | Add QtOpenGL .def filesJani Hautakangas2010-09-142-0/+1406
| | |/ / | |/| |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-1422-93/+1414
|\ \ \ \ | |/ / / |/| | |
| * | | L10n: Update German translations for 4.7.1, part 1.Friedemann Kleint2010-09-145-8/+1322
| * | | build fix for configure.exeJoerg Bornemann2010-09-141-0/+1
| * | | I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-149-80/+82
| * | | Fix compile warnings.Friedemann Kleint2010-09-145-5/+7
| * | | expose GestureType for using in QMLZeno Albisser2010-09-142-0/+2