summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-271-1/+0
|\
| * Don't load components until the Loader component itself is completedBea Lam2011-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously components were loaded as soon as setSource() or setSourceComponent() were called, even if the Loader component was not complete. If a source component had been set, the itemChanged(), statusChanged() etc. signals would be emitted before the Loader would be complete and before the internal item had been sized. If a source had been set via url, these signals were not emitted at all. It also caused loaded() to be emitted twice for components set by setSourceComponent(). Task-number: QTBUG-16319 Reviewed-by: Martin Jones
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-271-2/+0
| |\ | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/graphicsitems/qdeclarativelistview.cpp
| | * Revert "Fix loaded() signal to be emitted only once"Bea Lam2011-01-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768. QTBUG-16796 reports that this commit is causing regressions relating to initial sizing of items. Task-number: QTBUG-16796
* | | Setting the size of a loader overwrote its implict size.Martin Jones2011-01-271-0/+3
|/ / | | | | | | | | | | | | | | If the created item does not have a valid width/height then our implictWidth/Height should be the same as the items implict size. Task-number: QTBUG-16928 Reviewed-by: Bea Lam
* | Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-2/+2
|/ | | | | | | | Overridden as readonly for elements that have an inherent implicit size such as Text, TextEdit, TextInput, positioners, Loader. Task-number: QTBUG-14957 Reviewed-by: Michael Brasser
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* Fix loaded() signal to be emitted only onceBea Lam2011-01-101-0/+2
| | | | | Task-number: QTBUG-16319 Reviewed-by: Martin Jones
* Remove QDeclarativeLoader::resizeModemae2010-05-031-2/+1
| | | | | | | | | | | | The explicit resizeMode is superfluous, all usecases could be achieved with the corrected default behaviour of the former ResizeLoaderToItem mode. The NoResize usecase is covered by wrapping the loader in an extra item. That means: A loader automatically gets its size from the item loaded unless the loader has an explicit size itself. Go-ahead-by: Michael Brasser
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-3/+3
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+88
QDeclarativeXXX.
generated by cgit v0.12 at 2024-10-11 02:25:08 (GMT)