From a203be1f4b1cd7fef7970ee9a887cd088e8edf12 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 4 Apr 2013 18:21:19 +0200 Subject: disable module when widgets is not available Change-Id: Ic9744c2bd451d37cbad57a8c4074e71756c6e00a Reviewed-by: David Faure (KDE) --- qtx11extras.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qtx11extras.pro b/qtx11extras.pro index 58c33f2..318861f 100644 --- a/qtx11extras.pro +++ b/qtx11extras.pro @@ -1 +1,3 @@ +requires(qtHaveModule(widgets)) + load(qt_parts) -- cgit v1.2.1 From bd82bff721810a678c2302552a6f673cd148996f Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 5 Apr 2013 19:51:15 +0200 Subject: doc: Minor changes to qtx11extras.qdocconf Change-Id: I0f8e6b3c4dc6a7ab00f69a0ce38e74d14b46c41a Reviewed-by: Laszlo Papp Reviewed-by: Jerome Pasion --- src/x11extras/doc/qtx11extras.qdocconf | 54 +++++++++++++--------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/src/x11extras/doc/qtx11extras.qdocconf b/src/x11extras/doc/qtx11extras.qdocconf index 1f40470..c2c9611 100644 --- a/src/x11extras/doc/qtx11extras.qdocconf +++ b/src/x11extras/doc/qtx11extras.qdocconf @@ -1,49 +1,35 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) -# Name of the project which must match the outputdir. Determines the .index file project = qtx11extras description = Qt X11 Extras Reference Documentation url = http://qt-project.org/doc/qt-$QT_VER/qtx11extras version = $QT_VERSION -# Directories in which to search for files to document and images. -# By default set to the root directory of the project for sources -# and headers and qdoc will therefore generate output for each file. -# Images should be placed in /dic/images and examples in -# /examples. -# Paths are relative to the location of this file. -exampledirs += ../../../examples \ - snippets +qhp.projects = qtx11extras -headerdirs += .. -imagedirs += images -sourcedirs += .. +qhp.qtx11extras.file = qtx11extras.qhp +qhp.qtx11extras.namespace = org.qt-project.qtx11extras.$QT_VERSION_TAG +qhp.qtx11extras.virtualFolder = qtx11extras +qhp.qtx11extras.indexTitle = Qt X11 Extras +qhp.qtx11extras.indexRoot = -depends += qtcore qtwidgets +qhp.qtx11extras.filterAttributes = qtx11extras $QT_VERSION qtrefdoc +qhp.qtx11extras.customFilters.Qt.name = QtX11Extras $QT_VERSION +qhp.qtx11extras.customFilters.Qt.filterAttributes = qtx11extras $QT_VERSION -# The following parameters are for creating a qhp file, the qhelpgenerator -# program can convert the qhp file into a qch file which can be opened in -# Qt Assistant and/or Qt Creator. +qhp.qtx11extras.subprojects = classes +qhp.qtx11extras.subprojects.classes.title = C++ Classes +qhp.qtx11extras.subprojects.classes.indexTitle = Qt X11 Extras C++ Classes +qhp.qtx11extras.subprojects.classes.selectors = class fake:headerfile +qhp.qtx11extras.subprojects.classes.sortPages = true -# Defines the name of the project. You cannot use operators (+, =, -) in -# the name. Properties for this project are set using a qhp..property -# format. -qhp.projects = qtx11extras +depends += qtcore qtwidgets -# Sets the name of the output qhp file. -qhp.qtx11extras.file = qtx11extras.qhp +headerdirs += .. -# Namespace for the output file. This namespace is used to distinguish between -# different documentation files in Creator/Assistant. -qhp.qtx11extras.namespace = org.qt-project.qtx11extras.$QT_VERSION_TAG +sourcedirs += .. -# Title for the package, will be the main title for the package in -# Assistant/Creator. -qhp.qtx11extras.indexTitle = Qt X11 Extra Classes Documentation +exampledirs += ../../../examples \ + snippets -# Only update the name of the project for the next variables. -qhp.qtx11extras.virtualFolder = qtx11extras -qhp.qtx11extras.subprojects = classes -qhp.qtx11extras.subprojects.classes.title = Qt X11 Extras C++ Classes -qhp.qtx11extras.subprojects.classes.selectors = class fake:headerfile -qhp.qtx11extras.subprojects.classes.sortPages = true +imagedirs += images -- cgit v1.2.1