summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add 'We mean it.' header.Aaron McCarthy2010-02-111-2/+13
|
* Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-11668-25780/+43304
|\ | | | | | | | | Conflicts: configure
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1011-298/+475
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Remove assertion for all files being watched. Fixed regression. Added method to clear the undo/redo stacks. Fixed setting back spaces when streaming a QPointF Move find widget in it's own source file. Some further cleanup.
| | * Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| | | | | | | | | | | | For unknown reasons, the assumption does not hold at times.
| | * Fixed regression.Erik Verbruggen2010-02-101-4/+4
| | |
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1010-289/+462
| | |\ | |/ / | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Added method to clear the undo/redo stacks. Fixed setting back spaces when streaming a QPointF Move find widget in it's own source file. Some further cleanup.
| | * Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67
| | | | | | | | | | | | Reviewed-by: mae
| | * Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1
| | | | | | | | | | | | | | | When streaming a QPointF, it did not restore the inserting of spaces like the QPoint does.
| | * Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
| | | | | | | | | | | | Reviewed-by: ck
| * | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-10151-5887/+2762
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (104 commits) Documentation: clarified RVCT support for Symbian Update Symbian OS def files for 4.6.2 Remove the installer from the Qt sources. Don't remove all dependencies when patching the pkg. Fixes qabstractslider autotest Workaround for abld toolchain issue with s60main Add a recursive rule for running the auto-tests. Do not run the tests automatically during install. Enabling runfast mode when vfpv2 used. Fixing a test case to be runnable on Symbian device. [CRASH] audioinput and audiooutput examples crash when no devices are Fixed casual crash in initializeDb (Symbian) Fixes scrolling horizontally with a mouse wheel over sliders. don't use QKeySequence::mnemonic() after all Fixed qt_x11_wait_for_window_manager Revert change 34f1758 on non-Synbian platforms Fixed QGifHandler::loopCount(). Doc: Clarified ownership of custom buttons added to a QDialogButtonBox. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 ) don't use stylesheet for just making labels bold ...
| | * \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-09151-5887/+2762
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1018-233/+390
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile fix for embedded. Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0918-233/+390
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile fix for embedded. Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0818-233/+390
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile fix for embedded. Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| | | * | | Compile fix for embedded.Denis Dzyubenko2010-02-084-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0818-233/+400
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-0818-233/+400
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
| | | | | * | | Revised fix for system tray popup activationJens Bache-Wiig2010-02-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change af7d2b2127dadbdf828c60c75255bb1b4f591651 does have some negative side-effects. This should limit the fix to void unnecessary activation when the parent window already has focus. Reviewed-by: denis
| | | | | * | | Fixed draggabletext example.Denis Dzyubenko2010-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example expects that you can only move items around inside the same application. However when dragging items to another application it is allowed to either move or copy items. Mouse cursors during the DND should respect that. Reviewed-by: Bradley T. Hughes
| | | | | * | | Added new mouse cursor types.Denis Dzyubenko2010-02-0513-231/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Qt::DragCopyCursor, DragMoveCursor and DragLinkCursor that are already used internally for drag-n-drop, but were not exposed before. On X11 made them use themed cursors through the Xcursor library. Drag-n-drop now use these new cursors. Inspired-by: David Benjamin MR#2215 Reviewed-by: Bradley T. Hughes
| | | | | * | | 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 ↵Qt Continuous Integration System2010-02-0946-1348/+2432
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Add missing license header. Compile fixes. S60 style: Compile fix. A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| | * | | | | Assistant: Add missing license header.ck2010-02-092-7/+34
| | | | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0846-1348/+2405
| | |\ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Compile fixes. S60 style: Compile fix. A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0846-1348/+2405
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Compile fixes. S60 style: Compile fix. A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| | | * | | | Compile fixes.ck2010-02-085-12/+18
| | | | | | |
| | | * | | | S60 style: Compile fix.Friedemann Kleint2010-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up cc1f88b8.
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0844-1347/+2398
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: A few trivial optimizations Rewrote bookmark handling, the previous code was just plain awful. Small style cleanup. Fix some warnings. Designer: Emit QDesignerPropertyEditorInterface::propertyChanged(). Designer: Support the 'windowOpacity'-property for forms. Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".." Assistant: Treat "unfiltered" filter in a apecial way. Assistant: Give meaningful context to translations. Fixed handling of paths containing ".." in QFileSystemModel on Windows. QAbstractItemModel docs: Fix typo. Assistant: Eliminate private tr contexts.
| | | | * | | A few trivial optimizationsThorbjørn Lindeijer2010-02-054-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use QHash/QMap::values/keys unnecessarily. Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
| | | | * | | Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2603 Reviewed-by: ck
| | | | * | | Small style cleanup.kh12010-02-051-6/+4
| | | | | | |
| | | | * | | Fix some warnings.kh12010-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| | | | * | | Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().Friedemann Kleint2010-02-043-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken by introduction of new signal with extended parameters. Emit both signals and block against each other. Tested against Eclipse integration. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTBUG-7764
| | | | * | | Designer: Support the 'windowOpacity'-property for forms.Friedemann Kleint2010-02-032-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analogous to windowTitle, etc. Task-number: QTBUG-7822
| | | | * | | Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." ↵Robert Loehning2010-02-021-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or ".." Reviewed-by: Jan-Arve
| | | | * | | Assistant: Treat "unfiltered" filter in a apecial way.ck2010-02-024-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't put the translated string into the help engine. - Don't let it be edited by users. Reviewed-by: kh1
| | | | * | | Assistant: Give meaningful context to translations.ck2010-02-027-48/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1 Instigated-by: Friedemann Kleint
| | | | * | | Fixed handling of paths containing ".." in QFileSystemModel on Windows.Robert Loehning2010-02-011-46/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jan-Arve
| | | | * | | QAbstractItemModel docs: Fix typo.ck2010-02-011-1/+1
| | | | | | |
| | | | * | | Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging private tr contexts into the surrounding class keeps related strings together. Contributed-by: Ritt Konstantin Reviewed-by: kh1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-081-507/+67
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Performance: Use QImage's smoothscaling instead of old private code
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reasons, QJpegHandler had its own smoothscaling code. QImage's scaling has since evolved to become both faster and better, so avoid code duplication and just use QImage for scaling. Reviewed-by: Trond
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-082-22/+11
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Replace qt_vg_imageBits() with constBits() in the OpenVG code
| | * | | | | Replace qt_vg_imageBits() with constBits() in the OpenVG codeRhys Weatherley2010-02-082-22/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-056-45/+30
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842) Get rid of setFirstActionActive on mouse release in QMenu
| | * | | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 424eabac69df3234006669a69ca0ec9653e4ce63. The commit changed behavior of WA_QuitOnClose when WA_DontShowOnScreen was used, but WA_DontShowOnScreen should only have visual effects. Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
| | * | | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The point in keeping this behaviour seems limited, and it is causing a bug on touch-screens where there are no mouse moves. Task-number: QTBUG-7907 Reviewed-by: ogoffart Reviewed-by: Thierry
generated by cgit v0.12 at 2025-08-14 20:47:46 (GMT)