summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1342-2829/+1122
| |\
| | * Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | * Some more refactoring.kh12010-02-1212-358/+462
| | * Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| | * add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| | * use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | * move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| | * fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| | * purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| | * purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| | * remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | * remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | * remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | * simplifyOswald Buddenhagen2010-02-121-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-qml into master-integra...Qt Continuous Integration System2010-02-121-2/+7
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-125-13/+31
| | | |\
| | | * | 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/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-121-118/+112
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-122605-135/+319217
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Compile fix for OSX.Roberto Raggi2010-02-121-1/+2
| | | |/ | | |/|
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-124-6/+2
| | |\ \
| | | * | Fix warningsAaron Kennedy2010-02-124-6/+2
| | * | | Make compile. QmlMetaType::isObject() has changed to isQObject().Bea Lam2010-02-121-1/+1
| | |/ /
| | * | Reference count shared expression dataAaron Kennedy2010-02-122-1/+7
| | * | Cleanup public QmlMetaType APIAaron Kennedy2010-02-1213-173/+136
| | * | Fix case sensitivity bug in previous commitJoona Petrell2010-02-122-2/+2
| | * | Adds inputMethodHint property to TextEdit and TextInput.Joona Petrell2010-02-126-0/+47
| | * | Decouple Loader from QmlGraphicsItemJoona Petrell2010-02-129-43/+231
| | * | Make test more stable.Rohan McGovern2010-02-121-1/+0
| | * | Fixed race condition in tst_qmlgraphicswebview::multipleWindowsRohan McGovern2010-02-122-1/+5
| | * | Explicitly pass size to standard pixmap icon loaders.Michael Brasser2010-02-121-95/+95
| | * | Fix qmlgraphicswebview:pixelCache autotest by setting defaults on htmlLeonardo Sobral Cunha2010-02-121-1/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-112598-40/+318918
| | |\ \
| | | * | Fixed compile of these recently renamed tests.Rohan McGovern2010-02-119-9/+9
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-112598-40/+318918
| | | |\ \
| | | | * | Update QmlChanges.txtLeonardo Sobral Cunha2010-02-111-0/+2
| | | | * | Adds qml prefix to all declarative autotestsLeonardo Sobral Cunha2010-02-11215-19/+19
| | | | * | Removed "running: true" for animations used as propertyvaluesourceLeonardo Sobral Cunha2010-02-1130-39/+33
| | | | * | Animations are running by default when used as property source valueLeonardo Sobral Cunha2010-02-115-2/+69
| | | | * | Fix QmlEngine offlineStoragePath test.Martin Jones2010-02-111-1/+1
| | | | * | Fix Image test on Windows.Martin Jones2010-02-111-4/+4
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-110-0/+0
| | | | |\ \
| | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-111-9/+9
| | | | | |\ \
| | | | | * | | Test should use ceil() not floor() since ceil() is used for calculatingBea Lam2010-02-111-2/+2