summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed duplicated implementation of readRegistryKeys from configureGareth Stockwell2010-02-183-125/+6
* Factored epocRoot implementation out of qmakeGareth Stockwell2010-02-1813-106/+292
* Factored readRegistryKey implementation out of qmakeGareth Stockwell2010-02-189-100/+259
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-02-181-1/+1
|\
| * Use correct include path for qglobal.hIain2010-02-181-1/+1
* | QWebView scrolling doesn't clear old elements before painting againSami Merila2010-02-182-8/+18
|/
* 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 branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-171-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-171-2/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-161-2/+3
| | |\ \ \
| | | * | | Fix broken image loading on windows.kh12010-02-161-2/+3
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-171-14/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed autotest failure in tst_QGraphicsScene::render on Maemo.Samuel Rødal2010-02-171-14/+4
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-175-348/+452
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'audio-examples' into 4.6Gareth Stockwell2010-02-164-339/+443
| |\ \ \ \ \
| | * | | | | Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
| | * | | | | Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
| | * | | | | Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
| | * | | | | Cleaned up memory management in audio input exampleGareth Stockwell2010-02-162-36/+54
| | * | | | | Changed variable names in audio input example to match Qt code styleGareth Stockwell2010-02-162-93/+93
| | * | | | | Made level calculation in audio input example work for all formatsGareth Stockwell2010-02-162-42/+80
| | * | | | | Removed unused variable from audio input exampleGareth Stockwell2010-02-162-7/+3
| | * | | | | Update suspend/resume button label in audio input exampleGareth Stockwell2010-02-161-0/+2