summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2018-05-14 16:30:29 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2018-05-14 14:43:26 +0000
commit9ffac00e032dbf2887f57b0eb8f3152967d16d16 (patch)
tree8115ecab490967b6facfd71baddb1b8647139ca8
parent6e4bbf498667d3f9be7d95e5c5d3d8acac001825 (diff)
downloadqtapplicationmanager-9ffac00e032dbf2887f57b0eb8f3152967d16d16.tar.gz
Add support for the new clang based qdoc parser in Qt 5.11
Change-Id: I900268dae0f84f2bf8b6794130ac34d28cbe9b26 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r--doc/QtApplicationManagerDoc16
-rw-r--r--doc/applicationmanager-project.qdocconf4
-rw-r--r--doc/doc.pro4
3 files changed, 24 insertions, 0 deletions
diff --git a/doc/QtApplicationManagerDoc b/doc/QtApplicationManagerDoc
new file mode 100644
index 00000000..523e87d2
--- /dev/null
+++ b/doc/QtApplicationManagerDoc
@@ -0,0 +1,16 @@
+// needed for the new clang based qdoc parser in Qt 5.11
+#include <QtAppManApplication/QtAppManApplication>
+#include <QtAppManCommon/QtAppManCommon>
+#include <QtAppManCrypto/QtAppManCrypto>
+#include <QtAppManDBus/QtAppManDBus>
+#include <QtAppManInstaller/QtAppManInstaller>
+#include <QtAppManIpc/QtAppManIpc>
+#include <QtAppManLauncher/QtAppManLauncher>
+#include <QtAppManMain/QtAppManMain>
+#include <QtAppManManager/QtAppManManager>
+#include <QtAppManMonitor/QtAppManMonitor>
+#include <QtAppManNotification/QtAppManNotification>
+#include <QtAppManPackage/QtAppManPackage>
+#include <QtAppManPluginInterfaces/QtAppManPluginInterfaces>
+#include <QtAppManSharedMain/QtAppManSharedMain>
+#include <QtAppManWindow/QtAppManWindow>
diff --git a/doc/applicationmanager-project.qdocconf b/doc/applicationmanager-project.qdocconf
index 5cb2f991..7e6c12e8 100644
--- a/doc/applicationmanager-project.qdocconf
+++ b/doc/applicationmanager-project.qdocconf
@@ -3,6 +3,10 @@ description = Public API of the application manager: QML and DBus
url = https://doc.qt.io/QtApplicationManager
version = $QT_VERSION
+# needed for the new clang based qdoc parser in Qt 5.11
+moduleheader = QtApplicationManagerDoc
+includepaths = -I .
+
sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
examples.fileextensions = "*.qml *.yaml"
diff --git a/doc/doc.pro b/doc/doc.pro
index 91641599..2b5653ab 100644
--- a/doc/doc.pro
+++ b/doc/doc.pro
@@ -1,5 +1,9 @@
TEMPLATE = aux
+# needed for the new clang based qdoc parser in Qt 5.11
+!prefix_build:INCLUDEPATH *= $$[QT_INSTALL_HEADERS]
+else:INCLUDEPATH *= $BUILD_DIR/include
+
build_online_docs: {
QMAKE_DOCS = $$PWD/online/applicationmanager.qdocconf
} else {