diff options
| author | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-06-20 14:30:36 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@theqtcompany.com> | 2016-07-01 08:29:51 +0000 |
| commit | 9134c1bd5bf464d00127103557a2289243dadd40 (patch) | |
| tree | b2fc8e6bfb775a482a704a78dddb9c94378bd5a6 | |
| parent | cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 (diff) | |
Doc: fixed issue compiling qtwaylandcompositor.html
Added 2 cpp.ignoretokens statements
Change-Id: I0f86ba94682b6f9fc0e76484a14ece7c39ff436a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rw-r--r-- | src/compositor/doc/qtwaylandcompositor.qdocconf | 13 | ||||
| -rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 17 |
2 files changed, 8 insertions, 22 deletions
diff --git a/src/compositor/doc/qtwaylandcompositor.qdocconf b/src/compositor/doc/qtwaylandcompositor.qdocconf index 230978f07..3954cb22f 100644 --- a/src/compositor/doc/qtwaylandcompositor.qdocconf +++ b/src/compositor/doc/qtwaylandcompositor.qdocconf @@ -1,4 +1,4 @@ -include($QT_INSTALL_DOCS/global//qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtWaylandCompositor description = Qt Wayland Compositor Reference Documentation @@ -31,12 +31,15 @@ qhp.QtWaylandCompositor.subprojects.examples.sortPages = true depends += qtqml qtquick qtdoc qtquickcontrols qmake qtgui -exampledirs += ../../../examples/wayland/ -headerdirs += ../ -sourcedirs += ../ +exampledirs += ../../../examples/wayland +headerdirs += .. +sourcedirs += .. imagedirs += images -examplesinstallpath = waylandcompositor +examplesinstallpath = wayland + +Cpp.ignoretokens += Q_WAYLAND_COMPOSITOR_EXPORT +Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY navigation.landingpage = "Qt Wayland Compositor" navigation.qmltypespage = "Qt Wayland Compositor QML Types" diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 6f00351c5..c992d3fcb 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -87,23 +87,6 @@ private: }; -/*! - \qmlmodule QtWayland.Compositor 1.0 - \title Qt Wayland Compositor QML Types - \ingroup qmlmodules - \brief Provides QML types for creating Wayland compositors - - This QML module contains types for creating Wayland compositors. - - To use the types in this module, import the module with the following line: - - \code - import QtWayland.Compositor 1.0 - \endcode -*/ - - - //![class decl] class QWaylandCompositorPlugin : public QQmlExtensionPlugin { |