summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-29331-10079/+7886
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-298-29/+37
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-29111-2197/+2204
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfximageitem.cpp src/declarative/fx/qfxpathview.cpp src/declarative/util/qmllistmodel.cpp
| | * | Some foreach remove/improve.Martin Jones2009-04-288-29/+37
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-287-18/+29
| |\ \ \ | | | | | | | | | | | | | | | kinetic-declarativeui
| | * | | fix double slash prepending causing troubles on WinCEMaurice Kalinowski2009-04-281-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before adding a / to the path one should check if it doesn't end with one already. Otherwise one might get paths like //My Documents on WinCE causing the native call to crash the filesystem service on that system. Reviewed-by: alexis
| | * | | Fixed tabbar position reset on palette changeJens Bache-Wiig2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need to relayout on all changeEvents. The only events that should change the layout of tabs are StyleChange and FontChange. LayoutDirectionChange is separately by layouts. Task-number: 188389 Reviewed-by: ogoffart
| | * | | Compile Warnings removed in canConvertThierry Bastian2009-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were caused by a comparison between QVariant::Type and QMetaType::Type. We're using QMetaType::Float because QVariant have no such Float value Reviewed-by: denis
| | * | | Made tabbar tab icons set the On state for selected tabsJens Bache-Wiig2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to make a custom icon for the selected tab. We cannot use the Selected state because that has a blue tint on many platforms which is not what you typically want int a tab. The On state will only affect icons where these states are explicitly set. Task-number: 202063 Reviewed-by: ogoffart
| | * | | Fixed Compile after removal of D3D.Friedemann Kleint2009-04-283-8/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-28108-2177/+2178
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Fix qmlvariantanimation to behave as qmlnumericanimation when 'from' is not setLeonardo Sobral Cunha2009-04-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The qmlvariantanimation was setting an invalid 'fromValue' when the 'from' property was unspecified.
| | * | | Remove trailing whitespaces from qmlanimation*Leonardo Sobral Cunha2009-04-282-15/+14
| | | | |
| | * | | Coding style refactor, changing 'if(' and 'for(' to 'if (' and 'for ('Leonardo Sobral Cunha2009-04-28103-2154/+2154
| | | | |
| | * | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-287-11/+10
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-28215-7763/+5537
| |\ \ \ \ | | | |/ / | | |/| | | | | | | kinetic-declarativeui
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2811-11/+11
| | |\ \ \
| | | * | | Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | | Repair damage done by 8af3500125a03a54dddb8c46ee709b7b8d257f27Rhys Weatherley2009-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | | Merge branch '4.5'Rhys Weatherley2009-04-282-22/+48
| | |\ \ \ \ | | | |/ / /
| | | * | | Use PVR2DGetFrameBuffer to map screen 0Rhys Weatherley2009-04-282-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some PowerVR chipsets are unstable if mmap/PVR2DMemWrap is used to map screen 0 instead of using PVR2DGetFrameBuffer. This change makes the driver use PVR2DGetFrameBuffer for screen 0 and mmap/PVR2DMemWrap for all other screens. Reviewed-by: Julian de Bhal
| | * | | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-2716-295/+424
| | |\ \ \ \ | | | |/ / /
| | | * | | Stabilize auto test added in 8ebe882b077fffedc3ff80fb80d2e181d5e56ab8Bjoern Erik Nilsen2009-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWidget::repaint() is not immediate on the Mac; it has to go through the event loop.
| | | * | | Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent.Bjoern Erik Nilsen2009-04-275-2/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget does not support partial updates unless the context is single buffered and auto-fill background is disabled. The problem was that QPaintEvent::region() returned the requested update region without taking into account the limitation of QGLWidget. If QGLWidget doesn't support partial updates, it means everything has to be updated, and QPaintEvent::region() must return the whole widget rect. Auto test included. Task-number: 241785 Reviewed-by: Trond
| | | * | | fixes undefined behavior will closing all tabskh2009-04-276-116/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 249001, 236473 Reviewed-by: kh
| | | * | | QPixmapCache:Remove the old pixmap if you insert one with the same key.Alexis Menard2009-04-272-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you insert a new pixmap in the cache with a key that was already in the cache then we remove the old pixmap and add the new one. This avoid to fill the memory with garbage even if the cache has a protection to avoid running out of memory. This was discovered with QraphicsView and its cache. We don't need to keep old cached pixmaps for an item. Task-number: KDE Reviewed-by: Trond
| | | * | | Doc - cleaning up some documentation for QFileDialog and obsoleteKavindra Devi Palaraja2009-04-271-134/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation. getOpenFileNames() and getExistingDirectory() mentioned that the dir parameter was ignored. This is no longer the case. This bit was reviewed by nrc, the other fixes were just cleanups. Task-number: 252223 Reviewed-by: nrc
| | | * | | Ensure that QFontDialog::getFont() works on Mac OS X.Norwegian Rock Cat2009-04-271-40/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that running the font dialog modal means that the "fontChanged" action is not fired. Which means our font is never changed. Thankfully, since it's an app modal case, we can re-sync when the OK button is clicked. Task-number: 252000 Reviewed-by: Morten Sørvig
| | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-27208-12362/+4249
| | | |\ \ \
| | | | * | | Document what QWidget::winId() returns on Mac OS X.Norwegian Rock Cat2009-04-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are different types depending on Carbon and Cocoa, and it is probably helpful to point that out. Task-number: 251001 Reviewed-by: Kavindra
| | | * | | | Make dark color schemes look better in property editor (especially schemes ↵Jarek Kobus2009-04-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which have a grey color for text) Task: 252251 RevBy: Markus Goetz <Markus.Goetz@nokia.com>
| | * | | | | Fixes QLabel:hover{color:...} for simple textOlivier Goffart2009-04-275-23/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This was only working if the QLabel had a QTextControl) Also rename the QStyleSheetStyle::focusPalette to ...::styleSheetPalette Reviewed-by: Jens Bache-Wiig
| | * | | | | Tests for the last stylesheet change.Olivier Goffart2009-04-273-0/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and add some missing images required for a previous test
| | * | | | | Be able to set a border-image on plain QWidgetOlivier Goffart2009-04-271-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were not able to set border-image on plain QWidget, QDialog, QMainWindow, QFrame, QMenu, and more. And for some, not even border was working. PE_Widget used to only draw the background, now it draws both the whole rule (background + border) Since menu now have a PanelMenu, let's use that insead of PE_Widget + PE_FrameMenu. As for QFrame, we do not need to draw the border in CE_ShapedFrame, as PE_Widget does it. This patch mostly move code arounds. Reviewed-by: Jens Bache-Wiig
| | * | | | | QSortFilterProxyModel: remove the mapping of the child that are filtered awayOlivier Goffart2009-04-272-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the filter change Task-Number: relates to 251296 Reviewed-by: Marius Bugge Monsen
| | * | | | | Setting the print dialog to print pdf the QPrinter returns false on isValid()Thomas Zander2009-04-271-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user passes QString() on printer name we can still be valid if the format is pdf/postscript. So test that. Reviewed-by: Trond Kjernaasen
| | * | | | | Fixed to float support in QVariantThierry Bastian2009-04-272-25/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also added autotests
| | * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-278-11/+133
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Create the placeholder changes file for Qt 4.5.2.Jason McDonald2009-04-271-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-277-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me
| | * | | | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-2513-127/+269
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis
| | | * | | | Sometimes wrong clipping in QWidget::render() when passing a device orBjoern Erik Nilsen2009-04-244-11/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an untransformed painter When passing a painter to QWidget::render, we use the painter->paintEngine()->systemClip() as the "system viewport", i.e. all painting triggered by render() should be limited to this area. The only way to achieve this is by always ensuring the system clip is clipped to the same area (systemClip &= systemViewport). The problem however, was that we only did this for transformed painters. We must of course always do it when there's a systemViewport set, regardless of whether the painter is transformed or not. Auto test included. Task-number: 248852 Reviewed-by: Trond
| | | * | | | fixes empty tab titles after restartkh2009-04-242-14/+10
| | | | | | |
| | | * | | | cleanup, no functional changekh2009-04-243-94/+118
| | | | | | |
| | | * | | | Re-send network request properly when the socket is in Closing state.Denis Dzyubenko2009-04-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the "QAbstractSocket::connectToHost() called when already connecting/connected to <hostname>". The issue was that we were trying to call connect on a socket that was in a Closing state. We have to wait for the disconnected signal before we try to connect again. Reviewed-by: Prasanth
| | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-243-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6ebe3865025e2bb4d767a79435af4daf5a9b4db ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog Rubber-stamped by Ariya Hidayat. Fix qdoc warning about link to QAction::isEnabled. * Api/qwebpage.cpp: 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
| | | * | | | init combobox member and make sure we won't access it uninitializedkh2009-04-241-6/+9
| | | | | | |
| | * | | | | fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis
| | * | | | | Made urls more consistent and maintainable.Alessandro Portale2009-04-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://qtsoftware.com/support-services/support/platform-support-policy still points to a dead link, though.