Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

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