diff options
author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2020-06-17 12:09:54 +0200 |
---|---|---|
committer | Bernd Weimer <bernd.weimer@pelagicore.com> | 2020-06-19 17:01:45 +0200 |
commit | 9ae05e40b8bb6162f07b1d7e811d7c0d61372d2a (patch) | |
tree | c9fff69a7b37da0fa902051e3f1a78faaa75c94f | |
parent | 5bcd8f2239006ba9c68824321ce5b97d1f3577fb (diff) | |
download | qtapplicationmanager-9ae05e40b8bb6162f07b1d7e811d7c0d61372d2a.tar.gz |
Fix some documentation issues
Change-Id: Ifc075561f4a1900b6492c9d37adabca3bd0cc9ee
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r-- | doc/intents.qdoc | 2 | ||||
-rw-r--r-- | src/manager-lib/applicationmanager.cpp | 2 | ||||
-rw-r--r-- | src/manager-lib/intentaminterface.cpp | 1 | ||||
-rw-r--r-- | src/plugin-interfaces/containerinterface.cpp | 2 | ||||
-rw-r--r-- | src/window-lib/windowmanager.cpp | 8 |
5 files changed, 10 insertions, 5 deletions
diff --git a/doc/intents.qdoc b/doc/intents.qdoc index 57e6faa5..278f8a3f 100644 --- a/doc/intents.qdoc +++ b/doc/intents.qdoc @@ -92,7 +92,7 @@ registration; see the \l {Handling Intents in QML} {next section}. The application manager parses all those manifest files on startup (as well as when an application is installed at run time). Only the application manager itself and the System UI have access to the full list of registered intents defined by all the applications; for security and -privacy reason sthe applications themselves can't access this list. +privacy reasons the applications themselves can't access this list. \section1 Handling Intents in QML diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp index 661c7ea3..e1e396be 100644 --- a/src/manager-lib/applicationmanager.cpp +++ b/src/manager-lib/applicationmanager.cpp @@ -264,7 +264,7 @@ \qml Connections { target: ApplicationManager - onApplicationRunStateChanged: { + function onApplicationRunStateChanged() { if (runState === Am.NotRunning && ApplicationManager.application(id).lastExitStatus === Am.CrashExit) { ApplicationManager.startApplication(id); diff --git a/src/manager-lib/intentaminterface.cpp b/src/manager-lib/intentaminterface.cpp index 286ff661..29929f1b 100644 --- a/src/manager-lib/intentaminterface.cpp +++ b/src/manager-lib/intentaminterface.cpp @@ -572,6 +572,7 @@ QT_BEGIN_NAMESPACE_AM /*! \qmltype IntentServerHandler \inqmlmodule QtApplicationManager.SystemUI + \inherits IntentHandler \ingroup system-ui-instantiable \brief A handler for intent requests received within the system ui. diff --git a/src/plugin-interfaces/containerinterface.cpp b/src/plugin-interfaces/containerinterface.cpp index 58fc5228..e697088b 100644 --- a/src/plugin-interfaces/containerinterface.cpp +++ b/src/plugin-interfaces/containerinterface.cpp @@ -217,7 +217,7 @@ ContainerManagerInterface::~ContainerManagerInterface() { } applications within the application-manager. \row \li \c QT_WAYLAND_SHELL_INTEGRATION - \li Set to \c xdg-shell-v5. This is the preferred wayland shell integration. + \li Set to \c xdg-shell. This is the preferred wayland shell integration. \row \li \c AM_CONFIG \li A YAML, UTF-8 encoded version of \a amConfig (see below). diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp index 1e3f480f..4e380606 100644 --- a/src/window-lib/windowmanager.cpp +++ b/src/window-lib/windowmanager.cpp @@ -142,7 +142,9 @@ target: WindowManager // Send windows to a separate model so that we have control // over removals and ordering - onWindowAdded: windowsModel.append({"window":window}); + function onWindowAdded(window) { + windowsModel.append({"window":window}); + } } Repeater { @@ -544,7 +546,9 @@ int WindowManager::indexOfWindow(Window *window) const Connections { target: ApplicationManager - onWindowManagerCompositorReadyChanged: WindowManager.addExtension(texshare); + function onWindowManagerCompositorReadyChanged() { + WindowManager.addExtension(texshare); + } } \endcode |