diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:24:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-04 10:28:48 +0200 |
| commit | 9556f6d075b61fa95d6e1057f305e522a26f71d6 (patch) | |
| tree | 53190472453390810c47b9b5a47b23188a00267e /src/qml/types/qquickpackage.cpp | |
| parent | 42ffe9b193a5bd958b0853233fd0d94170722bd1 (diff) | |
| parent | 1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
Diffstat (limited to 'src/qml/types/qquickpackage.cpp')
| -rw-r--r-- | src/qml/types/qquickpackage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index 5fe73ec0e0..69bf058e6f 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -45,8 +45,8 @@ QT_BEGIN_NAMESPACE \ingroup qtquick-views \brief Specifies a collection of named items - The Package class is used in conjunction with - VisualDataModel to enable delegates with a shared context + The Package type is used in conjunction with + DelegateModel to enable delegates with a shared context to be provided to multiple views. Any item within a Package may be assigned a name via the |