diff options
Diffstat (limited to 'src')
-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 | ||||
-rw-r--r-- | src/doc/qtdeclarative.qdocconf | 12 | ||||
-rw-r--r-- | src/doc/src/declarative/anchor-layout.qdoc | 3 | ||||
-rw-r--r-- | src/doc/src/declarative/propertybinding.qdoc | 3 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativeintro.qdoc | 3 | ||||
-rw-r--r-- | src/doc/src/declarative/qtbinding.qdoc | 6 | ||||
-rw-r--r-- | src/imports/imports.pro | 4 | ||||
-rw-r--r-- | src/plugins/plugins.pro | 2 |
10 files changed, 25 insertions, 23 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 diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf index 6a87d453..e15a68c2 100644 --- a/src/doc/qtdeclarative.qdocconf +++ b/src/doc/qtdeclarative.qdocconf @@ -2,22 +2,22 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtDeclarative description = "Qt Declarative Examples Documentation" -url = http://qt-project.org/doc/qt-5.0/qtdeclarative -version = 5.0.1 +url = http://qt-project.org/doc/qt-$QT_VER/qtdeclarative +version = $QT_VERSION exampleinstallpath = declarative qhp.projects = QtDeclarative qhp.QtDeclarative.file = qtdeclarative.qhp -qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.500 +qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.$QT_VERSION_TAG qhp.QtDeclarative.virtualFolder = declarative qhp.QtDeclarative.indexTitle = Qt Quick qhp.QtDeclarative.indexRoot = -qhp.QtDeclarative.filterAttributes = declarative 5.0.1 qtrefdoc -qhp.QtDeclarative.customFilters.Qt.name = declarative 5.0.1 -qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative 5.0.1 +qhp.QtDeclarative.filterAttributes = declarative $QT_VERSION qtrefdoc +qhp.QtDeclarative.customFilters.Qt.name = declarative $QT_VERSION +qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative $QT_VERSION depends += qtcore qtgui qtscript qtdoc diff --git a/src/doc/src/declarative/anchor-layout.qdoc b/src/doc/src/declarative/anchor-layout.qdoc index a1c83cec..8aff358a 100644 --- a/src/doc/src/declarative/anchor-layout.qdoc +++ b/src/doc/src/declarative/anchor-layout.qdoc @@ -124,7 +124,8 @@ edge, the margin is not applied. For performance reasons, you can only anchor an item to its siblings and direct parent. For example, the following anchor is invalid and would produce a warning: -\badcode +\code +//bad code Item { id: group1 Rectangle { id: rect1; ... } diff --git a/src/doc/src/declarative/propertybinding.qdoc b/src/doc/src/declarative/propertybinding.qdoc index 60de77ce..450d2265 100644 --- a/src/doc/src/declarative/propertybinding.qdoc +++ b/src/doc/src/declarative/propertybinding.qdoc @@ -109,7 +109,8 @@ properties only allow you to assign a value that matches the property type. For example, if a property is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code property real volume: "four" //generates an error \endcode diff --git a/src/doc/src/declarative/qdeclarativeintro.qdoc b/src/doc/src/declarative/qdeclarativeintro.qdoc index 8fdc03aa..e5e52407 100644 --- a/src/doc/src/declarative/qdeclarativeintro.qdoc +++ b/src/doc/src/declarative/qdeclarativeintro.qdoc @@ -212,7 +212,8 @@ QML properties are what is known as \e type-safe. That is, they only allow you t matches the property type. For example, the \c x property of item is a real, and if you try to assign a string to it you will get an error. -\badcode +\code +//bad code Item { x: "hello" // illegal! } diff --git a/src/doc/src/declarative/qtbinding.qdoc b/src/doc/src/declarative/qtbinding.qdoc index 58d28159..f173025c 100644 --- a/src/doc/src/declarative/qtbinding.qdoc +++ b/src/doc/src/declarative/qtbinding.qdoc @@ -391,8 +391,8 @@ say you have a custom element \c PushButton with a \c buttonText property that i the value of a \c m_buttonText member variable. Modifying the member variable directly like this is not a good idea: -\badcode -// BAD! +\code +//bad code QDeclarativeComponent component(engine, "MyButton.qml"); PushButton *button = qobject_cast<PushButton*>(component.create()); button->m_buttonText = "Click me"; @@ -665,5 +665,3 @@ be used to build the application resources: See \l {The Qt Resource System} for more information. */ - - diff --git a/src/imports/imports.pro b/src/imports/imports.pro index aba013aa..2d7f4a55 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS += folderlistmodel particles gestures builtins.pro -contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders +qtHaveModule(opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders -!isEmpty(QT.webkitwidgets.name): SUBDIRS += webview +qtHaveModule(webkitwidgets): SUBDIRS += webview diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 49039871..7c4b8370 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += qmltooling -contains(QT_CONFIG, designer):SUBDIRS += qdeclarativeview +qtHaveModule(designer): SUBDIRS += qdeclarativeview |