summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-11668-25780/+43304
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1011-298/+475
| |\
| | * Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| | * Fixed regression.Erik Verbruggen2010-02-101-4/+4
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1010-289/+462
| | |\ | |/ /
| | * Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67
| | * Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1
| | * Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
| * | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-10151-5887/+2762
| |\ \
| | * \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-09151-5887/+2762
| | |\ \
| * | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1018-233/+390
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0918-233/+390
| | |\ \ \ | |/ / / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+390
| | |\ \ \
| | | * | | Compile fix for embedded.Denis Dzyubenko2010-02-084-10/+0
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+400
| | | |\ \ \
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0818-233/+400
| | | | |\ \ \
| | | | | * | | Revised fix for system tray popup activationJens Bache-Wiig2010-02-051-1/+4
| | | | | * | | Fixed draggabletext example.Denis Dzyubenko2010-02-051-1/+1
| | | | | * | | Added new mouse cursor types.Denis Dzyubenko2010-02-0513-231/+381
| | | | | * | | Doc: more \since 4.7Volker Hilsheimer2010-02-052-0/+6
| | | | | * | | Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0946-1348/+2432
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Assistant: Add missing license header.ck2010-02-092-7/+34
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0846-1348/+2405
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0846-1348/+2405
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Compile fixes.ck2010-02-085-12/+18
| | | * | | | S60 style: Compile fix.Friedemann Kleint2010-02-081-1/+1
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0844-1347/+2398
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | A few trivial optimizationsThorbjørn Lindeijer2010-02-054-9/+9
| | | | * | | Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | | | * | | Small style cleanup.kh12010-02-051-6/+4
| | | | * | | Fix some warnings.kh12010-02-051-0/+3
| | | | * | | Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().Friedemann Kleint2010-02-043-5/+23
| | | | * | | Designer: Support the 'windowOpacity'-property for forms.Friedemann Kleint2010-02-032-2/+9
| | | | * | | Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." ...Robert Loehning2010-02-021-0/+20
| | | | * | | Assistant: Treat "unfiltered" filter in a apecial way.ck2010-02-024-29/+30
| | | | * | | Assistant: Give meaningful context to translations.ck2010-02-027-48/+85
| | | | * | | Fixed handling of paths containing ".." in QFileSystemModel on Windows.Robert Loehning2010-02-011-46/+38
| | | | * | | QAbstractItemModel docs: Fix typo.ck2010-02-011-1/+1
| | | | * | | Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-081-507/+67
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-08171-957/+31224
| | |\ \ \ \ \
| | * | | | | | Performance: Use QImage's smoothscaling instead of old private codeaavit2010-02-051-507/+67
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-082-22/+11
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | Replace qt_vg_imageBits() with constBits() in the OpenVG codeRhys Weatherley2010-02-082-22/+11
| |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-056-45/+30
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | * | | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | * | | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-054-39/+40
| |\ \ \ \ \ | | |/ / / / | |/| | | |