summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-16148-824/+1483
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-161-4/+0
| |\
| | * transformOrigin defaults to Center, fix image/docs.Warwick Allison2010-02-161-4/+0
| * | MOBILITY -404 / 507Wolfgang Beck2010-02-162-0/+4
| * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1625-27/+88
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-166-7/+48
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-153-4/+8
| | |\
| | | * Fixing QDesktopServices so that file server session can be accessedAleksandar Sasha Babic2010-02-151-2/+2
| | | * Exposing some Validators requires Qt >= 4.7.0Alan Alpert2010-02-152-2/+6
| | * | Fix TextInput keypad navigationAlan Alpert2010-02-151-2/+4
| | |/
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-153-1/+8
| | |\
| | * | For qmldebug* tests, make sure engine is running before the test threadBea Lam2010-02-152-1/+36
| * | | Ensure new WebView windows are notified correctly. Improve test.Warwick Allison2010-02-151-1/+2
| | |/ | |/|
| * | Fix compile with -no-webkitWarwick Allison2010-02-153-1/+8
| |/
| * Fix buildWarwick Allison2010-02-153-6/+0
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1541-522/+719
| |\
| | * Remove noop codeAaron Kennedy2010-02-151-1/+0
| | * Move type initialization from global static initializers to QmlEngine constru...Warwick Allison2010-02-1440-521/+719
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13338-269/+107080
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-131-1/+1
| | |\ \ | | | |/ | | |/|
| | | * add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-131-2/+7
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-124-12/+29
| | | |\ \ | | | | |/
| | | * | Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-131-2/+12
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-12317-109/+106597
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-123-9/+27
| | |\ \
| | | * | Turned off subpixel AA text on surface with alpha in GL2 engine.Kim Motoyoshi Kalland2010-02-112-7/+25
| | | * | Changed a couple of GL defines from decimal to hex.Kim Motoyoshi Kalland2010-02-111-2/+2
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-111-3/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fixed cleaning of both undo- and redo-stacks.Erik Verbruggen2010-02-111-3/+2
| * | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1311-21/+15
| |\ \ \ \
| | * | | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-1/+2
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-123-11/+8
| | |\ \ \ \
| | | * | | | Fix to S60 softkeys when no active Qt window or native widget is shown.Janne Anttila2010-02-123-11/+8
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-02-124-4/+0
| | |\ \ \ \ \
| | | * | | | | Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| | * | | | | | doc: Fixed several typos.Martin Smith2010-02-123-5/+5
| | |/ / / / /
| * | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1265-221/+553
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-112-13/+11
| | |\ \ \ \ \
| | | * | | | | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ...Simon Hausmann2010-02-111-3/+1
| | | * | | | | QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | * | | | | QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | | |/ / / /
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-112-5/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | We need to export qBadAlloc() on all platformsHarald Fernengel2010-02-112-5/+0
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-111-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | QXmlSchema: fix crash in schema parserPeter Hartmann2010-02-111-1/+1
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-113-2/+103
| | |\ \ \ \ \
| | | * | | | | Update Symbian DEF filesIain2010-02-103-2/+103