summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump version to 4.6.2.Jason McDonald2010-01-1918-24/+24
* Add skeleton changes file for 4.6.2.Jason McDonald2010-01-191-0/+159
* Add released version of 4.6.1 changes file for posterity.Jason McDonald2010-01-191-157/+104
* Designer crashes when previewing QMainWindow with native Toolbar on MacPrasanth Ullattil2010-01-191-0/+13
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-193-3/+42
|\
| * QNativeSocketEngine windows: Fix performance degredation in write()Markus Goetz2010-01-191-2/+11
| * Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-192-1/+31
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-193-21/+40
|\ \
| * | another attempt at fixing the translations buildOswald Buddenhagen2010-01-192-4/+12
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-192-18/+29
| |\ \ |/ / /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-182-18/+29
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-162-18/+29
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-152-18/+29
| | | |\ \
| | | | * | use same small color dialog on S60 and Maemo 5Harald Fernengel2010-01-151-17/+28
| | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-151-1/+1
| | | | |\ \
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-141-1/+1
| | | | | |\ \
| | | | | | * | fix qm generation under windowsOswald Buddenhagen2010-01-141-1/+1
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1816-134/+342
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add proper license headers to new files.Thiago Macieira2010-01-182-0/+82
| * | | | | | tst_qnetworkreply: There were 2 unneeded QSignalSpyMarkus Goetz2010-01-181-2/+0
| * | | | | | Extend qfile_vs_qnetworkaccessmanager benchmarkMarkus Goetz2010-01-181-0/+35
| * | | | | | Enhance QFileNetworkReplyMarkus Goetz2010-01-185-70/+64
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1810-62/+161
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Fix QSslCertificate issuesMarkus Goetz2010-01-182-2/+25
| * | | | | | Change the prefered content size of the anomaly browserBenjamin Poulain2010-01-181-0/+2
| * | | | | | Avoid painting while loading in the anomaly demo browserBenjamin Poulain2010-01-185-5/+72
| * | | | | | QFile::readData: Simplify codeJoão Abecasis2010-01-181-6/+2
| * | | | | | If the file is open, there must be an engine.João Abecasis2010-01-181-6/+9
| * | | | | | QFile: Fix a pre-mature pessimizationJoão Abecasis2010-01-181-44/+42
| * | | | | | don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-182-2/+12
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-1812-20/+59
|\ \ \ \ \ \ \
| * | | | | | | Workaround for compiler error with MWCC (Symbian emulator)Shane Kearns2010-01-188-12/+12
| * | | | | | | Describe patch-capabilities in the install instructions.Shane Kearns2010-01-182-6/+45
| * | | | | | | Remove qmake warning by using appropriate variable.axis2010-01-181-1/+1
| * | | | | | | Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has ...Norbert Leser2010-01-181-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-182-0/+35
|\ \ \ \ \ \ \
| * | | | | | | Fixes: When calling QDesktopWidget::screenGeometry() with a nullAndy Shaw2010-01-182-0/+35
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-181-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix compilation on IA-64 with the Intel compiler: cast properly.Thiago Macieira2010-01-161-1/+1
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-180-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1625-974/+897
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-151-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1516-133/+839
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-1575-1508/+1039
| |\ \ \ \ \ \
| | * | | | | | Fixes: Cosmetic fix for maemo spin boxJens Bache-Wiig2010-01-151-1/+1
| | * | | | | | Adding texture glyph cache default.Adrian Constantin2010-01-151-0/+2
| * | | | | | | Doc: Added placeholder pages for new examples and updated the overviews.David Boddie2010-01-1514-132/+836
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-155-5/+28
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |