From 2e27de456efb2c6a152cb60f254fbccb9c203a7e Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 15 Dec 2015 10:39:53 +0100 Subject: Doc: Rename the qdocconf to match the doc project name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qmake assumes that the conf file name and the project name are same, so 'make docs' fail if they are different. Change-Id: Ic4784524c50cd085096fbf8853138b48d818fd61 Reviewed-by: Topi Reiniö --- src/compositor/compositor.pro | 2 +- src/compositor/doc/compositor.qdocconf | 44 ------------------------- src/compositor/doc/qtwaylandcompositor.qdocconf | 44 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 src/compositor/doc/compositor.qdocconf create mode 100644 src/compositor/doc/qtwaylandcompositor.qdocconf (limited to 'src') diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 6a64cd70a..24aa19716 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -11,7 +11,7 @@ CONFIG -= precompile_header CONFIG += link_pkgconfig DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT -QMAKE_DOCS = $$PWD/doc/compositor.qdocconf +QMAKE_DOCS = $$PWD/doc/qtwaylandcompositor.qdocconf !contains(QT_CONFIG, no-pkg-config) { PKGCONFIG_PRIVATE += wayland-server diff --git a/src/compositor/doc/compositor.qdocconf b/src/compositor/doc/compositor.qdocconf deleted file mode 100644 index 125fb2b31..000000000 --- a/src/compositor/doc/compositor.qdocconf +++ /dev/null @@ -1,44 +0,0 @@ -include($QT_INSTALL_DOCS/global//qt-module-defaults.qdocconf) - -project = QtWaylandCompositor -description = Qt Wayland Compositor Reference Documentation -version = $QT_VERSION - -qhp.projects = QtWaylandCompositor - -qhp.QtWaylandCompositor.file = qtwaylandcompositor.qhp -qhp.QtWaylandCompositor.namespace = org.qtproject.qtwaylandcompositor.$QT_VERSION_TAG -qhp.QtWaylandCompositor.virtualFolder = qtwaylandcompositor -qhp.QtWaylandCompositor.indexTitle = Qt Wayland Compositor -qhp.QtWaylandCompositor.indexRoot = -qhp.QtWaylandCompositor.filterAttributes = qtwaylandcompositor $QT_VERSION qtrefdoc -qhp.QtWaylandCompositor.customFilters.Qt.name = QtWaylandCompositor $QT_VERSION -qhp.QtWaylandCompositor.customFilters.Qt.filterAttributes = qtwaylandcompositor $QT_VERSION - -qhp.QtWaylandCompositor.subprojects = qmltypes classes examples -qhp.QtWaylandCompositor.subprojects.qmltypes.title = QML Types -qhp.QtWaylandCompositor.subprojects.qmltypes.indexTitle = Qt Wayland Compositor QML Types -qhp.QtWaylandCompositor.subprojects.qmltypes.selectors = qmlclass -qhp.QtWaylandCompositor.subprojects.qmltypes.sortPages = true -qhp.QtWaylandCompositor.subprojects.classes.title = C++ Classes -qhp.QtWaylandCompositor.subprojects.classes.indexTitle = Qt Wayland Compositor C++ Classes -qhp.QtWaylandCompositor.subprojects.classes.selectors = class fake:headerfile -qhp.QtWaylandCompositor.subprojects.classes.sortPages = true -qhp.QtWaylandCompositor.subprojects.examples.title = Examples -qhp.QtWaylandCompositor.subprojects.examples.indexTitle = Qt Wayland Compositor Examples -qhp.QtWaylandCompositor.subprojects.examples.selectors = fake:example -qhp.QtWaylandCompositor.subprojects.examples.sortPages = true - -depends += qtqml qtquick qtdoc qtquickcontrols - -exampledirs += ../../../examples/wayland/ -headerdirs += ../ -sourcedirs += ../ -imagedirs += images - -examplesinstallpath = waylandcompositor - -navigation.landingpage = "Qt Wayland Compositor" -navigation.qmltypespage = "Qt Wayland Compositor QML Types" -navigation.cppclassespage = "Qt Wayland Compositor C++ Classes" -navigation.homepage = "Qt Documentation (Technology Preview)" diff --git a/src/compositor/doc/qtwaylandcompositor.qdocconf b/src/compositor/doc/qtwaylandcompositor.qdocconf new file mode 100644 index 000000000..125fb2b31 --- /dev/null +++ b/src/compositor/doc/qtwaylandcompositor.qdocconf @@ -0,0 +1,44 @@ +include($QT_INSTALL_DOCS/global//qt-module-defaults.qdocconf) + +project = QtWaylandCompositor +description = Qt Wayland Compositor Reference Documentation +version = $QT_VERSION + +qhp.projects = QtWaylandCompositor + +qhp.QtWaylandCompositor.file = qtwaylandcompositor.qhp +qhp.QtWaylandCompositor.namespace = org.qtproject.qtwaylandcompositor.$QT_VERSION_TAG +qhp.QtWaylandCompositor.virtualFolder = qtwaylandcompositor +qhp.QtWaylandCompositor.indexTitle = Qt Wayland Compositor +qhp.QtWaylandCompositor.indexRoot = +qhp.QtWaylandCompositor.filterAttributes = qtwaylandcompositor $QT_VERSION qtrefdoc +qhp.QtWaylandCompositor.customFilters.Qt.name = QtWaylandCompositor $QT_VERSION +qhp.QtWaylandCompositor.customFilters.Qt.filterAttributes = qtwaylandcompositor $QT_VERSION + +qhp.QtWaylandCompositor.subprojects = qmltypes classes examples +qhp.QtWaylandCompositor.subprojects.qmltypes.title = QML Types +qhp.QtWaylandCompositor.subprojects.qmltypes.indexTitle = Qt Wayland Compositor QML Types +qhp.QtWaylandCompositor.subprojects.qmltypes.selectors = qmlclass +qhp.QtWaylandCompositor.subprojects.qmltypes.sortPages = true +qhp.QtWaylandCompositor.subprojects.classes.title = C++ Classes +qhp.QtWaylandCompositor.subprojects.classes.indexTitle = Qt Wayland Compositor C++ Classes +qhp.QtWaylandCompositor.subprojects.classes.selectors = class fake:headerfile +qhp.QtWaylandCompositor.subprojects.classes.sortPages = true +qhp.QtWaylandCompositor.subprojects.examples.title = Examples +qhp.QtWaylandCompositor.subprojects.examples.indexTitle = Qt Wayland Compositor Examples +qhp.QtWaylandCompositor.subprojects.examples.selectors = fake:example +qhp.QtWaylandCompositor.subprojects.examples.sortPages = true + +depends += qtqml qtquick qtdoc qtquickcontrols + +exampledirs += ../../../examples/wayland/ +headerdirs += ../ +sourcedirs += ../ +imagedirs += images + +examplesinstallpath = waylandcompositor + +navigation.landingpage = "Qt Wayland Compositor" +navigation.qmltypespage = "Qt Wayland Compositor QML Types" +navigation.cppclassespage = "Qt Wayland Compositor C++ Classes" +navigation.homepage = "Qt Documentation (Technology Preview)" -- cgit v1.2.3