diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:01:49 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:02:05 +0100 |
| commit | bd7e251755c59dfef9192e78d278cdb7047f9920 (patch) | |
| tree | d59a502dcf992d4fb8ac43b8d1df969af79a8238 | |
| parent | f241b08b6e2078e0ff25419f554ea03279a69021 (diff) | |
| parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
Merge branch 'release' into stable
Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
| -rw-r--r-- | src/doc/qtdeclarative.qdocconf | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/declarative.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf index 6a87d453..96a769be 100644 --- a/src/doc/qtdeclarative.qdocconf +++ b/src/doc/qtdeclarative.qdocconf @@ -10,7 +10,7 @@ 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.501 qhp.QtDeclarative.virtualFolder = declarative qhp.QtDeclarative.indexTitle = Qt Quick qhp.QtDeclarative.indexRoot = diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 27ae628d..19cf491e 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ - examples \ parserstress \ qdeclarativecomponent \ qdeclarativecontext \ @@ -24,6 +23,7 @@ SUBDIRS += \ contains(QT_CONFIG, private_tests) { SUBDIRS += \ + examples \ qdeclarativeanchors \ qdeclarativeanimatedimage \ qdeclarativeanimations \ |