summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | Fixed compile of compilerwarnings test with vcproj generator.Rohan McGovern2010-02-173-3/+3
| | * | | Fixed compile of qlibrary test with vcproj generator.Rohan McGovern2010-02-171-2/+7
| | * | | Fixed compile of xmlpatterns tests with vcproj generator.Rohan McGovern2010-02-1775-114/+73
| | * | | Fixed compile of shm/sem tests with vcproj generator.Rohan McGovern2010-02-1731-46/+41
| | * | | Fixed compile of QtHelp tests with vcproj generator.Rohan McGovern2010-02-1710-109/+59
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-1712-3/+127
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fixed tests using Q_DECLARE_* when Qt is configured with -qtnamespaceRohan McGovern2010-02-164-0/+12
| | | * | Fixed compile of these tests when Qt is configured with -qtnamespaceRohan McGovern2010-02-165-3/+12
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-02-169-46/+135
| | | |\ \
| | | * | | Check in sample license headersJason McDonald2010-02-163-0/+103
* | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-18649-1964/+13813
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-18649-1964/+13837
| |\ \ \ \ \ \
| | * | | | | | Compile.Morten Johan Sørvig2010-02-184-2/+3
| | * | | | | | Remove these friend declarations that aren't necessary in 4.7Thiago Macieira2010-02-171-5/+0
| | * | | | | | Added a new flag to fine-tune gesture propagation policyDenis Dzyubenko2010-02-173-7/+160
| | * | | | | | AIX has a #define for hz, so undef itThiago Macieira2010-02-171-0/+4
| | * | | | | | Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"Mark Brand2010-02-171-6/+0
| | * | | | | | remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlibMark Brand2010-02-172-15/+9
| | * | | | | | remove -lz from OPENSSL_LIBS so as to respect qt-zlibMark Brand2010-02-171-0/+6