summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1923-136/+205
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1913-84/+170
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1813-84/+170
| | |\ | |/ /
| | * Moving QDir benchmarks; making way for new test casesJoão Abecasis2010-02-183-11/+15
| | * Fixing QDir benchmarks...João Abecasis2010-02-181-2/+2
| | * QTreeView: Fix premature pessimizationJoão Abecasis2010-02-181-4/+5
| | * Simplify code, fix a compiler warning... profit!João Abecasis2010-02-181-7/+5
| | * tst_qnetworkreply: Add another testcaseMarkus Goetz2010-02-181-0/+66
| | * QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-188-34/+35
| | |\
| | | * QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
| | | * Revert "Added note to make QList destructor virtual in version 5"Zeno Albisser2010-02-181-1/+1
| | | * Fix s390(x) atomic ops related crashesDirk Mueller2010-02-171-10/+6
| | | * Fix undefined sequence point compiler warningDirk Mueller2010-02-171-1/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-1811-176/+151
| |\ \ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-1811-176/+151
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Help system: Remove hard-coded qt namespace.ck2010-02-1811-58/+39
| | | * | Help system: Handle all Clucene exceptions.ck2010-02-181-118/+112
* | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-19372-1223/+20549
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-18160-529/+583
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-188-188/+175
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Always use display() in QEglContext, so initialization can occurTom Cooksey2010-02-181-12/+11
| | | * | | Fixed a regression in dockwidgets that would jump when toplevel resizedThierry Bastian2010-02-182-1/+2
| | | * | | Stabilize QGraphicsView benchmarks.Bjørn Erik Nilsen2010-02-181-125/+134
| | | * | | Remove platform dependent code from QGraphicsView benchmark.Bjørn Erik Nilsen2010-02-181-33/+1
| | | * | | Compiler warnings in QGraphicsView benchmark.Bjørn Erik Nilsen2010-02-181-3/+4
| | | * | | Stabilize QGraphicsScene benchmarks.Bjørn Erik Nilsen2010-02-181-1/+13
| | | * | | Compiler warning, unusable variable in tst_QGraphicsScene benchmark.Bjørn Erik Nilsen2010-02-181-1/+0
| | | * | | Documented behavior of blur effect radius and drop shadow offset.Samuel Rødal2010-02-181-2/+10
| | | * | | Fixed autotest failure in tst_QPainter::drawEllipse on Maemo.Samuel Rødal2010-02-182-10/+0
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-188-15/+44
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Use correct include path for qglobal.hIain2010-02-181-1/+1
| | | * | | Fixed softkey localizaton to comile also on platforms without softkeys.Janne Anttila2010-02-181-0/+2
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-187-14/+41
| | | |\ \ \ | | |/ / / /
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-177-14/+41
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Use correct (forward slash) separators in qmake-generated bld.infIain2010-02-171-1/+1
| | | | * | Support for dynamic localization in Symbian softkeys.Janne Anttila2010-02-176-13/+40
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-175-4/+7
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix compilation on Mac 32-bit.Thiago Macieira2010-02-171-1/+1
| | | * | | Doc fix, ensure that the \obsolete tag is placed correctlyAndy Shaw2010-02-171-1/+3
| | | * | | Added note to make QList destructor virtual in version 5Zeno Albisser2010-02-171-1/+1
| | | * | | Fix handling of Evaluation licenses on the Windows configure.exeThiago Macieira2010-02-172-1/+2
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-171-19/+22
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove unusable test case from QGraphicsItem benchmark.Bjørn Erik Nilsen2010-02-171-12/+0
| | | * | | Remove unstable test case from QGraphicsItem::setTransform benchmark.Bjørn Erik Nilsen2010-02-171-1/+0
| | | * | | Stabilize QGraphicsItem benchmarks.Bjørn Erik Nilsen2010-02-171-7/+23
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-17139-302/+336
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Change all ptrdiff_t to qptrdiff.Thiago Macieira2010-02-179-23/+22
| | | * | | HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
| | | * | | Fixed failure of maketestselftest with vcproj generator.Rohan McGovern2010-02-171-1/+3