summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Rhys Weatherley2010-03-1918-146/+160
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1817-147/+225
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bug when resetting QSortFilterProxyModel Fix the QSplitter not showing correctly in QGraphicsView Remove ; after Q_PROPERTY declaration Fix compilation issues of autotest on solaris fix a crash when registering 2 metatype name for the same actual type Fixed problem in painting of QTreeView
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-1818-146/+160
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-1818-146/+160
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.
| | | * | Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-1818-146/+160
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-183-18/+49
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Optimized visualRegionForSelection in various item views classes
* | | | | Fix double definition of qt_next_power_of_two()Rhys Weatherley2010-03-191-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Static linking doesn't work with two definitions of the function, one in QtGui and another in QtOpenGL. Make the one in QtGui static. Task-number: QTBUG-9170 Reviewed-by: Sarah Smith
* | | | Fix bug when resetting QSortFilterProxyModelStephen Kelly2010-03-182-2/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple proxies are connected to one source model which gets reset, the order of execution of the sourceModelAboutToBeReset slots could cause QPersistentModelIndexes to be invalidated in one proxy model before the same slot is executed in the other proxy model. Additionally, the persistent indexes in the QSFPM are invalidated before the persistent indexes in the source model. This patch makes them invalidated afterward now, which makes more sense. Merge-request: 503 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | | | Fix the QSplitter not showing correctly in QGraphicsViewThierry Bastian2010-03-181-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was due to the usage of mapToGlobal. It is now fixed by making the rubberband child of the window() of the splitter and using mapTo(window()) Task-number: QTBUG-8504 Reviewed-by: gabi
* | | | Remove ; after Q_PROPERTY declarationThierry Bastian2010-03-187-90/+90
| | | |
* | | | Fix compilation issues of autotest on solarisThierry Bastian2010-03-189-13/+13
| | | | | | | | | | | | | | | | Task-number: QTBUG-8590
* | | | fix a crash when registering 2 metatype name for the same actual typeThierry Bastian2010-03-181-11/+7
| | | | | | | | | | | | | | | | Reviewed-by: ogoffart
* | | | Fixed problem in painting of QTreeViewThierry Bastian2010-03-181-11/+11
| |/ / |/| | | | | | | | | | | | | | | | | It could beseen that not a full row was updated when moving the mouse from the decoration to its attached item. Reviewed-by: gabi
* | | Optimized visualRegionForSelection in various item views classesGabriel de Dietrich2010-03-183-18/+49
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the number of selected items is large (a few thousands), the computation of visualRegionForSelection can take a long time (up to a few seconds). Analysis with valgrind shows that most of the time is spent in miRegionOp (in qregion.cpp), which is being called by QRegion::operator+=. The visualRegionForSelection virtual method being called only to update the view after selection, we can safely ignore those item's rectangles outside the viewport, thus both reducing the number of calls to miRegionOp and the actual cost of each call. This, however, introduces a behaviour change in visualRegionForSelection, as the returned region will *not* contain any rectangle *not* intersecting the viewport. Reviewed-by: Thierry Task-number: QTBUG-884
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1812-250/+233
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add a raw bind() function to QGLBuffer. QTreeView: Remove a lot of useless and slow code. Make sure XCopyArea has completed before resuming rendering Make QX11GLPixmapData::scroll() return a value Fix some rendering/scrolling artifacts with QX11GLWindowSurface Implement scrolling in QX11GLWindowSurface Make WA_TranslucentBackground work with QX11GLWindowSurface Add ultra-paranoid synchronization to QX11GLPixmapData Fixed a potential crash in headerview when inserting a section Fix a sizing issue of message box on windows Vista/7
| * Add a raw bind() function to QGLBuffer.Rhys Weatherley2010-03-182-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | It is awkward for a Qt application to do the equivalent of glBindBuffer(GL_ARRAY_BUFFER, 0) without knowing the QGLBuffer that was previously bound, or to bind a raw id obtained elsewhere. Resolving the extension is annoying. This change provides a raw low-level version of bind() for directly resolving and calling glBindBuffer() to assist such applications. Reviewed-by: Sarah Smith
| * QTreeView: Remove a lot of useless and slow code.Olivier Goffart2010-03-173-214/+29
| | | | | | | | | | | | | | | | | | | | | | Since commit cd2afafbc9c29393a80d415145c49eb5f439da55, we are always doing full relayout when adding or removing rows. So there is no point of doing the expensive incremental update of the viewItems. This has also the nice side effect to fix QTCREATORBUG-886 (see comment in the task) Reviewed-by: Thierry
| * Make sure XCopyArea has completed before resuming renderingTom Cooksey2010-03-171-0/+6
| | | | | | | | Reviewed-By: TrustMe
| * Make QX11GLPixmapData::scroll() return a valueTom Cooksey2010-03-171-1/+3
| | | | | | | | Reviewed-By: TrustMe
| * Fix some rendering/scrolling artifacts with QX11GLWindowSurfaceTom Cooksey2010-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | The GL2 paint engine sometimes adds a 0.49,0.49 offset when rendering into a multi-sampled QGLPaintDevice. The problem was that we weren't updating the QGLContext's QGLFormat with the EGLConfig so the paint engine thought it was rendering into an surface without multisampling and thus added the offset. Reviewed-By: TrustMe
| * Implement scrolling in QX11GLWindowSurfaceTom Cooksey2010-03-172-13/+36
| | | | | | | | | | | | | | Seems to have some artifacts when scrolling by 1 pixel, but apart from that works pretty well. Reviewed-By: TrustMe
| * Make WA_TranslucentBackground work with QX11GLWindowSurfaceTom Cooksey2010-03-171-0/+2
| | | | | | | | Reviewed-By: TrustMe
| * Add ultra-paranoid synchronization to QX11GLPixmapDataTom Cooksey2010-03-172-6/+65
| | | | | | | | | | | | | | | | | | This is completely over the top and many of these synchronisation points should be removed before doing any serious benchmarking. However, it makes sure any remaining bugs are not due to GPU & CPU being out of sync. Reviewed-By: TrustMe
| * Fixed a potential crash in headerview when inserting a sectionThierry Bastian2010-03-172-6/+17
| | | | | | | | | | | | | | This could happen if a section was moved andthen hidden Task-number: QTBUG-8650 Reviewed-by: Andy Shaw
| * Fix a sizing issue of message box on windows Vista/7Thierry Bastian2010-03-171-11/+38
| | | | | | | | | | | | | | | | The problem is that the font changes after the creation of the buttons and we were setting a fixed size to the datails button. Task-number: QTBUG-8381 Reviewed-by: gabi
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-182-16/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Pause the direct show graph when the playback rate is 0.0. Rebuild configure.exe (again enable QtDeclarative module by default)
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-172-16/+47
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Pause the direct show graph when the playback rate is 0.0. Rebuild configure.exe (again enable QtDeclarative module by default)
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Kai Koehne2010-03-17496-12172/+25154
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I submitted the same updated configure.exe to both qt.git and qt-multimedia-staging.git. Furthermore, there were other updates to configure.exe in qt.git. Seems git cannot resolve this on it's own. Conflicts: configure.exe
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-173-16/+47
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Pause the direct show graph when the playback rate is 0.0. Rebuild configure.exe (again enable QtDeclarative module by default)
| | | * | | Pause the direct show graph when the playback rate is 0.0.Andrew den Exter2010-03-172-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-161-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe (again enable QtDeclarative module by default)
| | | | * | | Rebuild configure.exe (again enable QtDeclarative module by default)Kai Koehne2010-03-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ad341d61 seems to have integrated a configure.exe from 4.6.
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-03-1713-135/+722
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Use AudioConverter when not preferred format. Handle values passed to setNotifyInterval more robustly. Make sure to check for a valid audioformat before open. Implement symbian^3 e32atomics API Fix runonphone target due to changed name of sis files Fix fromSymbian*() image conversion functions. Fixed cleartype text rendering on translucent surfaces. Make QColorDialog usable on small screens Added exit softkey to Wiggly example
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1713-135/+722
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-163-30/+52
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Use AudioConverter when not preferred format. Handle values passed to setNotifyInterval more robustly. Make sure to check for a valid audioformat before open.
| | * | | | | | Use AudioConverter when not preferred format.Justin McPherson2010-03-162-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * | | | | | Handle values passed to setNotifyInterval more robustly.Justin McPherson2010-03-162-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| | * | | | | | Make sure to check for a valid audioformat before open.Justin McPherson2010-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Dmytro Poplavskiy
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-157-41/+610
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implement symbian^3 e32atomics API Fix runonphone target due to changed name of sis files Fix fromSymbian*() image conversion functions.
| | * | | | | | | Implement symbian^3 e32atomics APIShane Kearns2010-03-155-38/+607
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian^3 provides an enhanced atomics API, which provides relaxed, acquire, release, ordered versions of each atomic operation. The armv5 and armv6 assembly atomics previously used in Qt are not SMP safe. The atomics provided by the OS will be SMP safe when using the SMP kernel, or similar ARM assembly implementations when using the uniprocessor kernel. Task-number: QTBUG-7655 Reviewed-by: mread
| | * | | | | | | Fix runonphone target due to changed name of sis filesShane Kearns2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change b37ac454832a23c17418f5ebca8928b63fe02289 changed sis file names from qt_debug-armv5.sis to qt.sis This updates the runonphone make target to the new sis file name Reviewed-by: axis
| | * | | | | | | Fix fromSymbian*() image conversion functions.Jason Barron2010-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not explicitly create instances of QS60PixmapData in this function because it is possible that we are using another graphics system. The fromNativeType() function is virtual so the graphics system will create the right version of the pixmap data for us and ensure that we get into the right implementation. Reviewed-by: Aleksandar Sasha Babic
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-151-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed cleartype text rendering on translucent surfaces.
| | * | | | | | | | Fixed cleartype text rendering on translucent surfaces.Trond Kjernaasen2010-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using gamma corrected 11 bit values instead of the 8 bit non- corrected values, which caused some strange rendering effects. Task-number: QTBUG-9036 Reviewed-by: Samuel
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-151-23/+46
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Make QColorDialog usable on small screens
| | * | | | | | | | Make QColorDialog usable on small screensHarald Fernengel2010-03-151-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColorDialog was always assuming that it got its minimal size requirements. On a lot of screens, this was not the case, so choosing a color in the QColorPicker was totally off. This patch handles the resize event correctly, so the QColorPicker will be usable on all possible screen sizes. This fixes Maemo's bug https://bugs.maemo.org/show_bug.cgi?id=9526 Reviewed-by: Robert Griebl
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-151-0/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added exit softkey to Wiggly example
| | * | | | | | | | | Added exit softkey to Wiggly exampleMiikka Heikkinen2010-03-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of QtP delta reduction effort, original task: QTTH-42 Reviewed-by: Janne Anttila
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-171-12/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: add default values to parameter of virtual methods in QProxyModel
| * | | | | | | | | add default values to parameter of virtual methods in QProxyModelThierry Bastian2010-03-171-12/+13
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That makes it consistent with the other models. Task-number: QTBUG-8766 Reviewed-by: gabi
generated by cgit v0.12 at 2025-08-25 21:26:45 (GMT)