summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-105-9/+65
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-074-8/+64
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Lancelot: bail out if rendering consistently failsaavit2011-04-071-1/+10
| | * | | | | | | | | Minor optimization to lance/elotaavit2011-04-071-1/+2
| | * | | | | | | | | Make it possible to test the new font hinting in lance[elot]aavit2011-04-073-6/+52
| * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-0770-857/+2276
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge remote branch 'qt-mainline/master'aavit2011-04-0769-856/+2275
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixes: The "test: too many arguments" error after every makeaavit2011-04-071-1/+1
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-092-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| * | | | | | | | | | | | Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
* | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-095-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-095-22/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-092-17/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | * | | | | | | | | | | | | HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-081-3/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-082-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | * | | | | | | | | | | | | | fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-04-0912-102/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-0712-102/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-04-061-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Fix typos in QSharedPointer documentation.Jason McDonald2011-04-061-11/+11
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-04-061-74/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Remove test for compiler correctnessJason McDonald2011-04-061-17/+0
| | | * | | | | | | | | | | | | | | | | Refactor qpointer dereference testsJason McDonald2011-04-061-19/+10
| | | * | | | | | | | | | | | | | | | | Prefer QCOMPARE to QVERIFY for comparisons.Jason McDonald2011-04-061-3/+3
| | | * | | | | | | | | | | | | | | | | Improve coverage of qpointer autotestJason McDonald2011-04-051-0/+7
| | | * | | | | | | | | | | | | | | | | Add comments, eliminate duplication in qpointer autotest.Jason McDonald2011-04-051-7/+17
| | | * | | | | | | | | | | | | | | | | Remove redundant includes and functions from qpointer autotest.Jason McDonald2011-04-051-29/+0
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-03-271-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Fix tst_XmlPatterns::xquerySupport() autotestSergio Ahumada2011-03-251-8/+8
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-03-241949-74768/+111147
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-241949-74768/+111147
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-teamQt Continuous Integration System2011-01-1010767-16726/+100031
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-1010658-10751/+10751
| | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-teamJason McDonald2011-01-101-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-teamQt Continuous Integration System2011-01-101-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.Sergio Ahumada2011-01-101-1/+4
| | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-085-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add support for -unset <prop> option to qmake.Darryl L. Miles2011-04-085-4/+26
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-0811-38/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-0811-38/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-085-25/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Cocoa: p1 bug fix: fix auto test regressionsRichard Moe Gustavsen2011-04-072-6/+17
| | | * | | | | | | | | | | | | | | | | | | Cocoa: p1 bug fix: revert use of subWindowStackingRichard Moe Gustavsen2011-04-064-24/+29
| | * | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-074-11/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-074-11/+35