summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master'Olivier Goffart2010-06-15375-9110/+25591
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-113-8/+30
| |\
| | * Adjust handling of library .bundle on MacZeno Albisser2010-06-111-4/+8
| | * Fix compilation: remove spurious semi-colonThiago Macieira2010-06-111-1/+1
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-111-3/+21
| | |\ | |/ /
| | * Avoid the incorrect usage of QScopedArrayPointer.Denis Dzyubenko2010-06-111-3/+21
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-06-113-3/+46
| |\ \
| | * | Export QDeclarativeAbstractAnimation and QDeclarativeScriptActionMarco Bubke2010-06-101-2/+2
| | * | Add count, at and clear to flickableDataMarco Bubke2010-06-092-1/+44
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-06-10371-9101/+25517
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-08371-9101/+25517
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-081-1/+1
| | | |\
| | | | * Change the directory where smart-installable application package isMiikka Heikkinen2010-06-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-06-0845-97/+674
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-0845-97/+674
| | | | |\ \ | | | |/ / /
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
| | | | |\ \
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-080-0/+0
| | | | | |\ \ | | | | |/ / /
| | | | | * | Merge commit 'v4.6.3' into 4.6Jason McDonald2010-06-080-0/+0
| | | | | |\ \
| | | | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...v4.6.3Simon Hausmann2010-06-013-2/+12
| | | | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-012-12/+28
| | | | | | * | Always construct s60 screen furniture even if not used.Janne Koskinen2010-06-011-4/+1
| | | | | | * | Change to release licenses for 4.6.3.Jason McDonald2010-05-308885-115693/+115693
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-075-0/+108
| | | | |\ \ \ \
| | | | | * | | | fix translations from some header files being omittedOswald Buddenhagen2010-06-075-0/+108
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-392/+370
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
| | | | |/ / / /
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-071-1/+1
| | | | |\ \ \ \
| | | | | * | | | Fix style sheet error with slider handleqCaro2010-06-071-1/+1
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-041-370/+392
| | | | |\ \ \ \ \
| | | | | * | | | | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| | | | | * | | | | syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| | | | | |/ / / /
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-043-6/+40
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-06-043-6/+40
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-4/+4
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | fix misleading hintOswald Buddenhagen2010-06-031-1/+1
| | | | | * | | | support TARGETs with spacesOswald Buddenhagen2010-06-031-3/+3
| | | | |/ / / /
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-06-032-2/+2
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| | | | | * | | double-quote string which contains a single-quoteOswald Buddenhagen2010-06-031-1/+1
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-06-031-0/+3
| | | | |\ \ \ \
| | | | | * | | | Fix the bindTexture() filters on X11 to not rely on mipmap generation.Trond Kjernåsen2010-06-031-0/+3
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-36/+378
| | | | |\ \ \ \ \
| | | | | * | | | | Fix QWS build failureGareth Stockwell2010-06-031-1/+1
| | | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-35/+377
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-06-0314-35/+377
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Removed compiler warningsGareth Stockwell2010-06-026-2/+14
| | | | | | | * | | | | Window visibility changes update TLW backing store reference countGareth Stockwell2010-06-022-8/+17
| | | | | | | * | | | | Enable visibility change events on all Symbian native windowsGareth Stockwell2010-06-021-0/+1
| | | | | | | * | | | | Added reference counting to QWidgetBackingStoreGareth Stockwell2010-06-028-29/+102
| | | | | | | * | | | | Added tst_QWidget::destroyBackingStoreWhenHiddenGareth Stockwell2010-06-021-0/+247