summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Commit patch by Gareth.Frans Englich2009-08-129-130/+765
| | | | | The patch originally contained all changed done to MMF Phonon, but this commit contains the changes only Gareth did.
* Merge branch 'master' into topic/mmfphononFrans Englich2009-08-122892-53184/+145122
|\ | | | | | | | | | | Conflicts: src/3rdparty/phonon/phonon/factory.cpp src/s60installs/qt_libs.pro
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicFrans Englich2009-08-1217-104/+82
| |\
| | * Revert "Fix to QtNetwork ARMV5 UDEB compilation"Jason Barron2009-08-124-55/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 32f931cb6ab5f3e50f1f582276d896f2dff716f1. This reverts commit e39de8681800cbe2ce31c155d23237410b7c21f3. The above commits were added as a workaround to a bug in RVCT which has been fixed. Conflicts: src/network/access/qnetworkcookie.h src/network/access/qnetworkrequest.h
| | * Revert '80dba8b8': Fixing default constructor problem with RVCT.Jason Barron2009-08-123-16/+5
| | | | | | | | | | | | | | | These were added to workaround a bug in RVCT which has apparently been fixed.
| | * Removed call to base class mouseReleaseEvent that shouldn't happen.axis2009-08-121-1/+0
| | | | | | | | | | | | | | | | | | | | | In that codepath, the item is editable, and we don't want the normal mouse handling (which may move the item) to happen. RevBy: Andreas
| | * Merge branch 'qlinecontrolFixes'axis2009-08-123-8/+37
| | |\
| | | * Fixed warning.axis2009-08-121-1/+1
| | | |
| | | * Redid 7b95b70bc307 for QLineControl.axis2009-08-121-5/+34
| | | |
| | | * Redid patch that was lost during merge with 4.6.axis2009-08-121-1/+1
| | | | | | | | | | | | | | | | See commit 203b2b2c611e2 for details.
| | | * Revert "Changed the behavior of ImCursorPosition slightly."axis2009-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ce02d0e9e0ad8d8ac47e4f3ee95bac5cb74ed184. This turned out not to be enough for proper selection support together with S60 FEP. Instead we will revert the behavior and add new API. (cherry picked from commit 6545932efa45ea2b8fbc1459d760ec5f15c63120) Conflicts: doc/src/qnamespace.qdoc src/gui/widgets/qlineedit.cpp
| | * | Fixed QtNetwork autotest build breaks for Symbian.Janne Anttila2009-08-121-1/+1
| | | | | | | | | | | | | | | | Also updated QtNetwork auto test category file.
| | * | Doc improvement made by David Boddie.Alessandro Portale2009-08-111-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | Docs: Mentioning that Symbian has a default font size of 7 pointsAlessandro Portale2009-08-111-1/+3
| | | |
| | * | Cleaned public Api of QS60Style due to review by Volker Hilsheimer.Alessandro Portale2009-08-114-19/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved handleDynamicLayoutVariantSwitch and handleSkinChange from QS60Style to QS60StylePrivate. QApplication (the only one calling those functions) is now a friend, thus has access to the private class.
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-111-1/+1
| | |\ \
| | * | | Fix autotest failure in qgraphicsitem.Shane Kearns2009-08-111-4/+18
| | | |/ | | |/| | | | | | | | | | | | | | | | | When autofocused child is deleted, remove from ancestors to avoid double deletion crash. Check for null receiver when auto SIP is enabled in mouseReleaseEvent
| * | | Revert "QItemSelectionModel did not send selectionChanged signal when ↵Frans Englich2009-08-112-23/+1
| | |/ | |/| | | | | | | | | | | | | deleting an item" This reverts commit d13418effc5f00474541ae513a30c9a42c2a1cb3.
| * | Prevent unnecessary repaints when moving with zero distance in moveRect().Frans Englich2009-08-111-1/+1
| |/ | | | | | | | | | | | | | | This path is triggered from the layout system on S60. Reported by Nokia/Dallas' multimedia team. We haven't yet figured out a way to trigger this through auto test. Reviewed-by: Paul
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-1114-158/+133
| |\
| | * Refactor S60 related changes to QGraphicsItem / QGraphicsView.Andreas Aardal Hanssen2009-08-112-133/+44
| | | | | | | | | | | | | | | | | | The change mostly removes duplication and does minor touchups. Reviewed-by: axis
| | * Fixed KERN-EXEC 3 crash in qdesktopwidget for S60.Janne Anttila2009-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopWidgetPrivate::rects etc variables are shared between QDesktopWidgetPrivate objects and private objects maintains refcount to data. We called cleanup for private object directly from QDesktopWidget, which caused the shared private data to be freed after some instance of QDesktopWidget was destroyed. Since we bypassed the refcount also the data for other QDesktopWidgets was invalidated and this cauyse crash when resizeEvent was received. There is no need to call QDesktopWidgetPrivate::cleanup directly since when QDesktopWidget is deleted, it will call destructor for QDesktopWidgetPrivate which deletes the shared data based on ref count.
| | * Add comparison operators also to subclassesHarald Fernengel2009-08-101-2/+32
| | | | | | | | | | | | | | | Compiler would for some reason choose operator bool() instead when comparing subclasses of QScopedPointer.
| | * s/class/struct/Harald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | Stop confusing MSVC by correctly forward declare QScopedPointerDeleter as struct
| | * add operator! to QScopedPointerHarald Fernengel2009-08-102-0/+13
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-10101-990/+1532
| | |\
| | * | moved declaration of engine to better match merge and to remove warningmread2009-08-101-1/+2
| | | |
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-073111-51420/+142391
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts fixed: src/corelib/io/qdiriterator.cpp
| | * | | exception -> leave conversion for pointer eventsmread2009-08-072-1/+7
| | | | |
| | * | | replacing assert with recovery for begin/end paint lock for exception ↵mread2009-08-071-3/+5
| | | | | | | | | | | | | | | | | | | | compatability
| | * | | check for possibility that time pointer is NULLmread2009-08-071-1/+2
| | | | |
| | * | | fixing memory leaks in dir iteratormread2009-08-062-8/+21
| | | | |
| | * | | plugin factory loader memory leak protectionmread2009-08-061-5/+8
| | | | |
| | * | | Leaves -> exceptionsmread2009-08-061-5/+6
| | | | |
| * | | | RVCT didn't like a test bool variable exported directly from QtGui,Miikka Heikkinen2009-08-111-2/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing applications to panic with KERN-EXEC 3. Fixed by providing accessor for the bool in question instead of exporting it directly. Note: Unknown why exactly this panic occurs, as exporting bools works just fine when tested with small test executable + dll. Something in QtGui causes this to fail; I suspect it might be the massive code segment size and relocation of the data segment that is contributing to this problem. RevBy: Jason Barron
| * | | Merge commit 'qt/master'Jason Barron2009-08-1014-31/+113
| |\ \ \
| | * | | Remove unused member.Jan-Arve Sæther2009-08-101-1/+0
| | | | |
| | * | | Whitespace cleanupJan-Arve Sæther2009-08-101-3/+3
| | | | |
| | * | | Fix default QWidget size on X servers with XineramaBradley T. Hughes2009-08-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default widget size is normally calculated from the root window size, but when running on an X server with Xinerama enabled, the root window spans all screens, making the widget far to large. Use the default screen's size instead to give the widget a size that should fit on a single screen.
| | * | | Link with winscw againHarald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | compiler mangles "struct" and "class" differently, so make sure that QTestCharBuffer is always forward declared as "struct".
| | * | | Xml patterns: remove line in .pro file that added the schematron dirPeter Hartmann2009-08-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this line was dragged in from the Xml schema branch, but there is no schematron in Qt. Reviewed-by: TrustMe
| | * | | Add QBENCMARK_ONCE to QTestLib.Morten Sorvig2009-08-104-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code block associated with QBENCHMARK_ONCE macro will only be executed once, whether the backend returns a valid result or not. The "-iterations" command line argument is also ignored. This is useful for benchmarking code that has side effects. Revby: jasplin
| | * | | Make QTimeLine::start() restart from the beginning as the documentation says.David Faure2009-08-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation implies that start restarts. Which it did, but only if the timeline was finished _and_ the duration hadn't been changed meanwhile. So after a setDuration(), start() would do nothing, which was unexpected. Merge-request: 1145 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-1071-880/+1237
| | |\ \ \
| | | * | | Emit axisChanged() when the QGraphicsRotation3D axis changes.Rhys Weatherley2009-08-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | | * | | Set default QGraphicsTransform3D axis to (0, 0, 1)Rhys Weatherley2009-08-101-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs said that the default axis was (0, 0, 1), but the code and unit tests were using (0, 0, 0). Modify the code to match the docs because (0, 0, 0) is not very useful. Also optimize the calculation of sin/cos values for 90, 180, and 270 degrees. Reviewed-by: Aaron Kennedy
| | | * | | Add a private function for conversion a QPixmap into a VGImageRhys Weatherley2009-08-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom OpenVG pixmap filters written by users will need to access the VGImage form of a QPixmap. The qPixmapToVGImage() function is provided for this purpose, as a private API. Reviewed-by: Sarah Smith
| | * | | | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-105-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
| * | | | | Merge commit 'qt/master-stable'Jason Barron2009-08-1089-960/+1420
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| | * | | QItemSelectionModel did not send selectionChanged signal when deleting an itemGabriel de Dietrich2009-08-072-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a tree-like model with one of its grand-children being selected. Added recursive deselection for the model. Task-number: 232634 Reviewed-by: thierry
generated by cgit v0.12 at 2024-10-25 00:31:37 (GMT)