summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Move http resume code into http backend.Aaron McCarthy2010-02-124-18/+60
| | | | | | | | | | | | | | | | | Adds two new virtual functions to QNetworkAccessBackend: bool canResume() const; and void setResumeOffset(quint64) canResume() is used to query the existing backend if resuming is supported for the current request. setResumeOffset() is used to set an additional offset which should be applied when the backend posts the request. The default implementation of canResume() returns false (resuming not supported). The default implementation of setResumeOffset() does nothing.
* Fix compiler warning, unused variable.Aaron McCarthy2010-02-121-2/+0
|
* Merge remote branch 'origin/master' into master-mobilityRohan McGovern2010-02-1113-124/+356
|\ | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-1113-124/+356
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Added geometry shaders to changes-4.7.0 file + a small doc update about it Crash when deleting the parent of a context menu while it is being displayed Workaround for a certain functionally challenged compiler Fix failing QDoubleValidator tests Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. QMainWindow: update the separator size when the style change Another round of Geometry shader review. Fix Geometry shaders based on review Geometry Shader support in QGLShaderProgram
| | * Added geometry shaders to changes-4.7.0 file + a small doc update about itGunnar Sletta2010-02-101-0/+2
| | |
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-10108-878/+1753
| | |\
| | | * Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-106-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asynchronous deletion of a widget (e.g. calling deleteLater() after a timeout) could be caught by the context menu's event loop if called with exec() instead of popup(). This causes the context menu to be deleted twice in some cases, and a crash generally follows. Although this introduces a minor behaviour change, we now use popup() with the WA_DeleteOnClose attribute to display the context menu in all the contextMenuEvent() bodies, except in those where the menu was already protected by a QPointer. In QDialog::contextMenuEvent(), we use QWeakPointer to reflect the fact that the menu was previously allocated in the stack. QAbstractSpinBox, QDialog and QMdiSubWindow keep using QMenu::exec() in contextMenuEvent() as they need the QAction returned. Some auto-tests included. Reviewed-by: Olivier Task-number: QTBUG-7902
| | | * Workaround for a certain functionally challenged compileraavit2010-02-101-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-104-102/+101
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix failing QDoubleValidator tests Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. QMainWindow: update the separator size when the style change
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-094-102/+101
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix failing QDoubleValidator tests Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0. QMainWindow: update the separator size when the style change
| | | | | * Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0.aavit2010-02-091-73/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libpng doc advises against accessing the info_ptr structure directly, and in 1.4.0 the members are flagged as deprecated, so such access gives compilation warnings. This patch makes qpnghandler use the recommended access functions instead. Reviewed-by: Trond
| | | | | * QMainWindow: update the separator size when the style changeOlivier Goffart2010-02-083-29/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2774 Reviewed-ny: Thierry
| | * | | | Merge branch 'geometry-shaders-to-integrate'Gunnar Sletta2010-02-084-5/+231
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: src/opengl/qglshaderprogram.cpp
| | | * | | Another round of Geometry shader review.Gunnar Sletta2010-02-082-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | * | | Fix Geometry shaders based on reviewGunnar Sletta2010-02-042-10/+16
| | | | | |
| | | * | | Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-014-1/+228
| | | | | |
* | | | | | Add 'We mean it.' header.Aaron McCarthy2010-02-111-2/+13
| | | | | |
* | | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-11260-3350/+9646
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: configure
| * | | | | 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-105-23/+68
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Merge branch 'qt-master-from-4.6' of ↵Qt Continuous Integration System2010-02-1078-471/+1193
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0978-471/+1193
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | 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-0917-232/+389
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0817-232/+389
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0817-232/+399
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0817-232/+399
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | | 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-086-56/+48
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-086-56/+48
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | 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-086-56/+48
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | | * | | | 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
| | | | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-0887-672/+1575
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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-053-15/+11
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-11/+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-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2300 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | * | | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-051-14/+16
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings. doc: Fixed some qdoc warnings.
| | | * | | | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| | | | | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-052-0/+39
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add QMacCompatGLenum overrides for new QGLShaderProgram functions
| | | * | | | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7391 Reviewed-by: Sarah Smith
generated by cgit v0.12 at 2025-01-08 00:13:44 (GMT)