summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-085-6/+5
|\
| * Let's not duplicate Symbian softkey menu top-level actions in submenu.Janne Anttila2010-09-081-1/+1
| * Remove some .pro statements left behind after IAP usage cleanupMiikka Heikkinen2010-09-082-4/+0
| * Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-082-1/+4
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0834-114/+461
|\ \ | |/ |/|
| * Fix compilation on Windows CEBradley T. Hughes2010-09-081-1/+1
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0834-113/+460
| |\ |/ /
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0834-113/+460
| |\
| | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0734-113/+460
| | |\
| | | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-09-0734-113/+460
| | | |\
| | | | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-0734-113/+460
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-0630-100/+381
| | | | | |\
| | | | | | * Add missing license headerJan-Arve Sæther2010-09-062-0/+82
| | | | | | * Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.Jan-Arve Sæther2010-09-062-0/+8
| | | | | | * Compile fix WinCEJan-Arve Sæther2010-09-032-5/+14
| | | | | | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-0328-100/+282
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-09-066-33/+685
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * Fixed input context trying to squeeze content into a full widget.axis2010-09-062-3/+7
| | | | | | * Cleaned up position tracking in the Symbian input methods.axis2010-09-065-17/+679
| | | | | | * Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-063-16/+2
| | | | | |/
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-09-012-5/+2
| | | | | |\
| | | | | | * Some small Solaris fixes.Pierre Rossi2010-08-312-5/+2
| | | | | |/
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-312-7/+70
| | | | | |\
| | | | | | * Fix QtScript Date <--> QDateTime (local time) conversionKent Hansen2010-08-312-7/+70
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-08-301-4/+9
| | | | | |\ \ | | | | | | |/
| | | | | | * Fix Qt applications freezing until mouse/keyboard events occur.Bradley T. Hughes2010-08-301-4/+9
| | | | | |/
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-08-271-0/+2
| | | | | |\
| | | | | | * Recognize GL_ARB_shader_objects as indicating shadersRhys Weatherley2010-08-271-0/+2
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-085-18/+89
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-08149-1605/+3663
| |\ \ \ \ \ \
| | * | | | | | Document difference between property binding and assignmentBea Lam2010-09-082-5/+62
| | * | | | | | Remove unused objectBea Lam2010-09-081-1/+0
| | * | | | | | Fix Worker ListModel to emit the right signal when items changeBea Lam2010-09-081-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-08115-1396/+3366
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0723-133/+169
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0786-1657/+4605
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: More work on the QML documentation.David Boddie2010-09-0716-116/+502
| * | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0643-335/+549
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-065-36/+93
| * | | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0389-634/+2028
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Doc: qdoc fixes.David Boddie2010-09-023-7/+7
| * | | | | | | | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| * | | | | | | | | | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| * | | | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-01218-3869/+8160
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-017-6/+86
| * | | | | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-27206-558/+5907
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doc: Fixed links and markup.David Boddie2010-08-271-5/+5
| * | | | | | | | | | | | Doc: More work on the QML documentation.David Boddie2010-08-2729-209/+955
| * | | | | | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-24201-17039/+16767
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Doc: Minor improvements and fixes.David Boddie2010-08-242-5/+5