diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-04 14:55:20 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-04 14:55:20 +0200 |
commit | 73b81cd379569f3fa54924738e00e35444ccbea4 (patch) | |
tree | d5c4b1392bd11318a0bec3f9543ffefab6164dda /doc/qmllive-project.qdocconf | |
parent | 4d360892c7a21b4b2aad0ec47ef3f60fb0b0b381 (diff) | |
parent | a9449980b08e94ae648d38ea98e5e7a20fc9365e (diff) |
Merge branch '5.8' into dev
Conflicts:
qmllive.pro
Change-Id: I14a957912a4caaf7a2d3734819d98097f79f2810
Diffstat (limited to 'doc/qmllive-project.qdocconf')
-rw-r--r-- | doc/qmllive-project.qdocconf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/qmllive-project.qdocconf b/doc/qmllive-project.qdocconf index d93882b..5744d9f 100644 --- a/doc/qmllive-project.qdocconf +++ b/doc/qmllive-project.qdocconf @@ -1,6 +1,6 @@ -project = QML Live -description = Pelagicore QML Live Reference Documentation -url = https://doc.qt.io/QmlLive +project = QmlLive +description = Pelagicore QmlLive Reference Documentation +url = https://doc.qt.io/QtQmlLive version = $QT_VERSION sources.fileextensions = "*.cpp *.qdoc *.mm *.qml" @@ -14,7 +14,7 @@ exampledirs = ../examples ../src headerdirs = \ ../src -sourcedirs = \ +sourcedirs += \ . \ ../src \ ../examples @@ -25,17 +25,17 @@ qhp.projects = QmlLive qhp.QmlLive.file = qmllive.qhp qhp.QmlLive.namespace = io.qt.qmllive.$QT_VERSION_TAG qhp.QmlLive.virtualFolder = qmllive -qhp.QmlLive.indexTitle = Qt QML Live +qhp.QmlLive.indexTitle = Qt QmlLive qhp.QmlLive.indexRoot = qhp.QmlLive.filterAttributes = QmlLive $QT_VERSION -qhp.QmlLive.customFilters.QmlLive.name = QML Live $QT_VERSION +qhp.QmlLive.customFilters.QmlLive.name = QmlLive $QT_VERSION qhp.QmlLive.customFilters.QmlLive.filterAttributes = QmlLive $QT_VERSION qhp.QmlLive.subprojects = manual -qhp.QmlLive.subprojects.manual.title = Qt QML Live -qhp.QmlLive.subprojects.manual.indexTitle = Qt QML Live +qhp.QmlLive.subprojects.manual.title = Qt QmlLive +qhp.QmlLive.subprojects.manual.indexTitle = Qt QmlLive qhp.QmlLive.subprojects.manual.type = manual -navigation.landingpage = "Qt QML Live" -buildversion = "Qt QML Live $QT_VERSION" +navigation.homepage = "Qt QmlLive" +buildversion = "Qt QmlLive $QT_VERSION" |