diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:08:40 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:08:40 +0100 |
commit | aa8e59c09cb03f56047ca65c3e89dd6daeec4d73 (patch) | |
tree | d45d5513511b0767925f453b637bda08139562da /src/declarative | |
parent | ae764c678c78c1e3530a6d0dc2de2a17c5d4815a (diff) | |
parent | cf8ef1676b70d70f5e1d2725d0b24d7df5e8cfe4 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/declarative.pro | 2 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativerepeater.cpp | 11 | ||||
-rw-r--r-- | src/declarative/util/util.pri | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 365cb04e..c5741c2b 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,6 +1,6 @@ TARGET = QtDeclarative QT = core-private gui-private widgets-private script-private -!isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns +qtHaveModule(xmlpatterns): QT_PRIVATE = xmlpatterns else: DEFINES += QT_NO_XMLPATTERNS MODULE=declarative diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 44721a9e..0e9a9be6 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -110,15 +110,16 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() The Repeater element creates all of its delegate items when the repeater is first created. This can be inefficient if there are a large number of delegate items and not all of the items are required to be visible at the same time. If this is the case, - consider using other view elements like ListView (which only creates delegate items - when they are scrolled into view) or use the \l {Dynamic Object Creation} methods to + consider using other view elements like ListView (which only creates delegate items + when they are scrolled into view) or use the \l {Dynamic Object Creation} methods to create items as they are required. - Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. + Also, note that Repeater is \l {Item}-based, and can only repeat \l {Item}-derived objects. For example, it cannot be used to repeat QtObjects: - \badcode + \code + //bad code Item { - //XXX does not work! Can't repeat QtObject as it doesn't derive from Item. + //Can't repeat QtObject as it doesn't derive from Item. Repeater { model: 10 QtObject {} diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 62fa8f16..3978b5eb 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -65,7 +65,7 @@ HEADERS += \ $$PWD/qdeclarativelistmodelworkeragent_p.h \ $$PWD/qlistmodelinterface_p.h -contains(QT_CONFIG, xmlpatterns) { +qtHaveModule(xmlpatterns) { QT+=xmlpatterns SOURCES += $$PWD/qdeclarativexmllistmodel.cpp HEADERS += $$PWD/qdeclarativexmllistmodel_p.h |