diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-24 11:26:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-24 11:48:46 +0200 |
| commit | 1a9759855639b9e2b3cdc0687d3381dcbf6c9815 (patch) | |
| tree | b2da51f6eddddb83c2d97cdcfac24d38d2e67a4e /src/quick/items/qquickloader.cpp | |
| parent | 8217ec1b888f3ff93f004801b018c5f85362c484 (diff) | |
| parent | e1fc2793aef53b84a3f1e19b6d6bdf1141340074 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/imports/qtquick2/plugins.qmltypes
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlcontext.cpp
src/qml/qml/qqmldata_p.h
src/qml/qml/qqmlengine_p.h
src/qml/qml/qqmljavascriptexpression.cpp
src/qml/qml/qqmlxmlhttprequest.cpp
src/qml/qml/v4/qv4bindings.cpp
src/qml/qml/v4/qv4irbuilder.cpp
src/qml/qml/v4/qv4jsonobject_p.h
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/qml/qml/v8/qv8bindings.cpp
src/qml/qml/v8/qv8contextwrapper.cpp
src/qml/qml/v8/qv8listwrapper.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/qml/qml/v8/qv8qobjectwrapper_p.h
src/qml/qml/v8/qv8sequencewrapper_p_p.h
src/qml/qml/v8/qv8typewrapper.cpp
src/qml/qml/v8/qv8valuetypewrapper.cpp
src/qml/types/qqmldelegatemodel.cpp
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/context2d/qquickcontext2d.cpp
sync.profile
tests/auto/qml/qjsengine/tst_qjsengine.cpp
tests/benchmarks/qml/animation/animation.pro
tools/qmlprofiler/qmlprofiler.pro
Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
Diffstat (limited to 'src/quick/items/qquickloader.cpp')
| -rw-r--r-- | src/quick/items/qquickloader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp index af766ac294..8f4dc0bd17 100644 --- a/src/quick/items/qquickloader.cpp +++ b/src/quick/items/qquickloader.cpp @@ -264,7 +264,7 @@ qreal QQuickLoaderPrivate::getImplicitHeight() const \c event.accepted to \c true so that the event is not propagated to the parent \l Rectangle. - Since QtQuick 2.0 Loader can also load non-visual components. + Since \c {QtQuick 2.0}, Loader can also load non-visual components. \section2 Using a Loader within a view delegate @@ -376,7 +376,7 @@ void QQuickLoader::setActive(bool newVal) \qmlproperty url QtQuick2::Loader::source This property holds the URL of the QML component to instantiate. - Since QtQuick 2.0 Loader is able to load any type of object; it + Since \c {QtQuick 2.0}, Loader is able to load any type of object; it is not restricted to Item types. To unload the currently loaded object, set this property to an empty string, @@ -451,7 +451,7 @@ void QQuickLoader::loadFromSource() To unload the currently loaded object, set this property to an empty string or \c undefined. - Since QtQuick 2.0 Loader is able to load any type of object; it + Since \c {QtQuick 2.0}, Loader is able to load any type of object; it is not restricted to Item types. \sa source, progress @@ -903,7 +903,7 @@ void QQuickLoaderPrivate::_q_updateSize(bool loaderGeometryChanged) \qmlproperty object QtQuick2::Loader::item This property holds the top-level object that is currently loaded. - Since QtQuick 2.0 Loader can load any object type. + Since \c {QtQuick 2.0}, Loader can load any object type. */ QObject *QQuickLoader::item() const { |