summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* docWarwick Allison2009-04-301-16/+11
|
* Documentation work.Michael Brasser2009-04-306-39/+33
|
* Fix crash in QmlDomDocument::load()Aaron Kennedy2009-04-302-3/+19
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-303-89/+137
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-3036-1353/+1657
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | More work on transform elements.Michael Brasser2009-04-303-89/+137
| | | | | | | | | | | | | | | AxisRotation/AxisTranslation have been renamed Rotation3D/Translation3D. Squish has gained a raster implementation and basic docs.
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-304-100/+50
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/follow/pong.qml examples/declarative/listview/dummydata/MyPetsModel.qml
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-3022-1237/+1411
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-30161-7707/+4013
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Documentation for ListViewMartin Jones2009-04-302-98/+46
| | | | | | | | | | | | | | | | | | | | Convert to new format, use \snippet.
| * | | | Don't delay initial resizeWarwick Allison2009-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | (otherwise "default" widget size happens first)
| * | | | Fix smooth scalingWarwick Allison2009-04-301-1/+3
| | | | |
* | | | | Convert all examples and demos from XML formatAaron Kennedy2009-04-302-2/+2
| | | | |
* | | | | Make custom parsers internal.Aaron Kennedy2009-04-3010-154/+155
| |_|/ / |/| | | | | | | | | | | Custom parsers still have a way to go before they fully fit the QML 2.0 language.
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-3020-726/+757
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/parser/javascriptgrammar.cpp src/declarative/qml/parser/javascriptgrammar_p.h
| * | | Fix crashWarwick Allison2009-04-301-4/+4
| | | | | | | | | | | | | | | | Continues d62bc81491b4b3ef76d626fd56f736427ee1e20c
| * | | Compress sizeChanged signal to give width and height.Warwick Allison2009-04-302-2/+15
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-296-620/+703
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Added first/lastSourceLocations to AST::UiObjectMember and improved the ↵Roberto Raggi2009-04-296-620/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generation of `fake' tokens. A `fake' token is a token generated while recovering from a syntax error.
| * | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-295-19/+52
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-29235-8714/+4676
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'source' into kinetic-declarativeuiYann Bodson2009-04-297-13/+13
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: demos/declarative/mediabrowser/content/PhonesPathView.qml demos/declarative/mediabrowser/mediabrowser.qml
| | | * | Rename the 'src' attribute 'source'. Don't need to be HTML-like anymore.Yann Bodson2009-04-297-13/+13
| | | | |
| * | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-291-1/+0
| | | | |
* | | | | Prototype custom parsers for non-xml qml languageAaron Kennedy2009-04-3012-301/+559
| | | | | | | | | | | | | | | | | | | | ListModel has been ported (under the name ListModel2) to demonstrate. ListModel2 behaves the same as ListModel, except that list "objects" must be called "ListElement" instead of a freeform name.
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-295-12/+242
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | API improvements for Flipable.Michael Brasser2009-04-293-8/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now specify an axis and rotation, rather than using transform. The tranform behavior has been preserved, however, to allow for cases where you want a more complex transform when rotating.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-29266-9026/+18892
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix plugin delayed loading. Allows settings from QML.Warwick Allison2009-04-292-4/+82
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-29124-6495/+2217
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | 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 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-284-10/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-28108-2177/+2178
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-28119-6411/+2115
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | kinetic-declarativeui
| | * | | | | 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-277-176/+180
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent.Bjoern Erik Nilsen2009-04-274-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | QPixmapCache:Remove the old pixmap if you insert one with the same key.Alexis Menard2009-04-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | 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
| | * | | | | | Fixes QLabel:hover{color:...} for simple textOlivier Goffart2009-04-274-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This was only working if the QLabel had a QTextControl) Also rename the QStyleSheetStyle::focusPalette to ...::styleSheetPalette Reviewed-by: Jens Bache-Wiig
| | * | | | | | 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-271-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the filter change Task-Number: relates to 251296 Reviewed-by: Marius Bugge Monsen