diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:44:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:44:58 +0200 |
| commit | a4d68e7d78a28225c23931431f0db6ebf75f5e41 (patch) | |
| tree | ea04abea84bfa53aa4212cade81df780f4a5d89b /src/imports | |
| parent | 5ce1c2a3bf9546171d2913c76330bc6d1b6a4789 (diff) | |
| parent | 6260c4376e598031e467416027703bd11012621d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
examples/wayland/minimal-qml/main.qml
Change-Id: Ic34029a6aa77f2b359f40258a05421d82efd5b37
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index b93f9f169..0403f8d39 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -88,23 +88,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 { |