summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-03-012-272/+141
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Simplified header export script for SymbianEckhart Koppen2011-03-012-272/+141
| * | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-02-18123-515/+2676
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0817-28/+218
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-087-1/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-077-1/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-077-1/+48
| * | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-071-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-071-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | PinchArea example produced incorrect scaling.Martin Jones2011-03-071-2/+9
| * | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-0410-25/+161
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-044-2/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Added image conversion flag to prevent conversions.Samuel Rødal2011-03-044-2/+10
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-046-23/+151
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Fix TextInput auto test failure on mac.Andrew den Exter2011-03-041-0/+1
| | | * | | | | | | | | | | | | Fix word selection locking on string boundaries.Andrew den Exter2011-03-042-12/+86
| | | * | | | | | | | | | | | | Fix potential crash in QTextControl.Lasse Holmstedt2011-03-041-2/+4
| | | * | | | | | | | | | | | | QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-033-8/+55
| | | * | | | | | | | | | | | | Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-032-1/+5
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-086-7/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix preprocessor directive.Fabien Freling2011-03-041-1/+1
| * | | | | | | | | | | | | | | Fix compiling issue on Lion.Fabien Freling2011-03-042-0/+14
| * | | | | | | | | | | | | | | Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-042-2/+9
| * | | | | | | | | | | | | | | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| * | | | | | | | | | | | | | | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-083-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Designer: Set dirty correctly in case resource paths were changed.Friedemann Kleint2011-03-073-1/+5
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-0715-918/+1255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix a typo in an EXPECT_FAIL dataset name.Jedrzej Nowacki2011-03-071-1/+1
| * | | | | | | | | | | | | | | Fix a test naming issue.Jedrzej Nowacki2011-03-072-34/+34
| * | | | | | | | | | | | | | | Improve Q_GLOBAL_STATIC macors.Jedrzej Nowacki2011-03-072-63/+64
| * | | | | | | | | | | | | | | Tests build fix.Jedrzej Nowacki2011-03-041-1/+1
| * | | | | | | | | | | | | | | Refactor qscriptjstestsuite to make it more maintainableKent Hansen2011-03-035-611/+399
| * | | | | | | | | | | | | | | Refactor qscriptv8testsuite to make it more maintainableKent Hansen2011-03-038-223/+771
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-0453-638/+2109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-2853-638/+2109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Readded a ';;' that was removed by mistake.axis2011-02-281-0/+1
| | * | | | | | | | | | | | | | | | Fixed mkspec detection for Symbian.axis2011-02-251-3/+2
| | * | | | | | | | | | | | | | | | Removed javascript-jit from default symbian-gcce build.axis2011-02-251-0/+2
| | * | | | | | | | | | | | | | | | QAbstractSocket: Check for socket state on Unbuffered readsMarkus Goetz2011-02-251-0/+2
| | * | | | | | | | | | | | | | | | Corrected a mismerge in GCCE link parameters.axis2011-02-241-1/+1
| | * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24874-19632/+39788
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | QAbstractSocket: Check for engine validity on Unbuffered readsMarkus Goetz2011-02-241-2/+5
| | * | | | | | | | | | | | | | | | | tst_qnetworkreply: fix the MiniHttpServer.Martin Petersson2011-02-241-1/+5
| | * | | | | | | | | | | | | | | | | tst_qnetworkProxyFactory: fix debug output.Martin Petersson2011-02-241-2/+2
| | * | | | | | | | | | | | | | | | | Fixed incorrect referral to an include file.axis2011-02-241-1/+1
| | * | | | | | | | | | | | | | | | | tst_qnetworkreply: getErrors() only ignore warning for the specific testMartin Petersson2011-02-241-1/+6
| | * | | | | | | | | | | | | | | | | Check engine existence before increasing reference countJiang Jiang2011-02-241-3/+6
| | * | | | | | | | | | | | | | | | | Fixed library casing.axis2011-02-241-1/+1
| | * | | | | | | | | | | | | | | | | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-242-1/+29