diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-15 15:07:42 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-15 15:08:26 +0300 |
commit | 9ad08f17c3cd96bb6b9d5d501870cb3987ed9097 (patch) | |
tree | e84ab2f923e202f3021e8a9f4d227fef195dfaf9 /src/doc/qtdeviceutilities-project.qdocconf | |
parent | 59405866644db41b866bdb561fe8ad2a1892f73b (diff) | |
parent | 261e4c619214af5e5cf95ec08a7d46d702ae0a93 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
261e4c6 Doc: Add documentation for C++ classes
0ecd391 Fix ip address tracking and display
Commit 0ecd391 originally cherry-picked from 5.12 branch, hence
few bogus conflicts in qnetworksettingsmanager.cpp.
Conflicts:
src/networksettings/qnetworksettingsinterfacemodel.cpp
src/networksettings/qnetworksettingsmanager.cpp
Change-Id: Ib8007ffc55ba935da42209303f637b51bad3ab1d
Diffstat (limited to 'src/doc/qtdeviceutilities-project.qdocconf')
-rw-r--r-- | src/doc/qtdeviceutilities-project.qdocconf | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/src/doc/qtdeviceutilities-project.qdocconf b/src/doc/qtdeviceutilities-project.qdocconf new file mode 100644 index 0000000..e8abc97 --- /dev/null +++ b/src/doc/qtdeviceutilities-project.qdocconf @@ -0,0 +1,85 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtDeviceUtilities +description = Qt Device Utilities $QT_VERSION +version = $QT_VERSION +macro.maintitle = "\\title Qt Device Utilities $QT_VERSION" + +includepaths += -I . +# -I ../bluetoothsettings \ +# -I ../displaysettings \ +# -I ../localdevice \ +# -I ../localesettings \ +# -I ../networksettings \ +# -I ../timedatesettings + +# pass a custom module header to Clang +moduleheader = QtDeviceUtilitiesDoc + +sourcedirs += src \ + ../imports/localesettings \ + ../imports/bluetoothsettings \ + ../imports/displaysettings \ + ../imports/localdevice \ + ../imports/localesettings \ + ../imports/timedatesettings \ + ../imports/networksettings \ + ../bluetoothsettings \ + ../displaysettings \ + ../localdevice \ + ../localesettings \ + ../networksettings \ + ../timedatesettings \ + ../settingsui/settingsuiplugin + +headerdirs += ../bluetoothsettings \ + ../displaysettings \ + ../localdevice \ + ../localesettings \ + ../networksettings \ + ../timedatesettings + +exampledirs += ../../examples + +imagedirs += images + +depends = qtcore qtdoc qtgui qtqml qtquick qtquickcontrols qtwidgets + +qhp.projects = QtDeviceUtilities + +qhp.QtDeviceUtilities.file = qtdeviceutilities.qhp +qhp.QtDeviceUtilities.namespace = io.qt.qtdeviceutilities.$QT_VERSION_TAG +qhp.QtDeviceUtilities.virtualFolder = qtdeviceutilities +qhp.QtDeviceUtilities.indexTitle = Qt Device Utilities $QT_VERSION +qhp.QtDeviceUtilities.indexRoot = + +qhp.QtDeviceUtilities.subprojects = classes qmltypes examples + +qhp.QtDeviceUtilities.subprojects.classes.title = C++ Classes +qhp.QtDeviceUtilities.subprojects.classes.indexTitle = Qt Device Utilities C++ Classes +qhp.QtDeviceUtilities.subprojects.classes.selectors = class fake:headerfile +qhp.QtDeviceUtilities.subprojects.classes.sortPages = true + +qhp.QtDeviceUtilities.subprojects.modules.title = QML Types +qhp.QtDeviceUtilities.subprojects.modules.indexTitle = Qt Device Utilities QML Types +qhp.QtDeviceUtilities.subprojects.modules.selectors = qmlmodule module +qhp.QtDeviceUtilities.subprojects.modules.sortPages = true + +qhp.QtWebEngine.subprojects.examples.title = Examples +qhp.QtWebEngine.subprojects.examples.indexTitle = Qt Device Utilities Examples +qhp.QtWebEngine.subprojects.examples.selectors = doc:example +qhp.QtWebEngine.subprojects.examples.sortPages = true + +macro.B2Q = "Boot to Qt" +macro.SDK = "Qt for Device Creation" +macro.QAS = "Qt Automotive Suite" +macro.B2QA = "\\e {Boot to Qt for embedded Android}" +macro.B2QL = "\\e {Boot to Qt for embedded Linux}" + +# Keep Device Creation as the landing page +navigation.landingpage = "Qt for Device Creation" +navigation.qmltypespage = "Qt Device Utilities QML Types" +navigation.cppclassespage = "Qt Device Utilities C++ Classes" + +Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY +Cpp.ignoretokens += Q_DEL_EXPORT |