diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2019-07-31 15:08:51 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2019-07-31 15:12:44 +0200 |
| commit | 3bc3dc4c8e912beb18aec7ab84af40c0129d84c0 (patch) | |
| tree | 1e967824b381dce5935255936b9db6a2c18def0e /examples/applicationmanager | |
| parent | 2907a594a7d83f814ef9f8446d904409a18248d0 (diff) | |
| parent | 45b32a94a10479cb1355edeb0db3c87c41935742 (diff) | |
Merge "Merge remote-tracking branch 'gerrit/5.13' into dev"
Diffstat (limited to 'examples/applicationmanager')
| -rw-r--r-- | examples/applicationmanager/applicationmanager.pro | 4 | ||||
| -rw-r--r-- | examples/applicationmanager/minidesk/doc/src/minidesk.qdoc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/examples/applicationmanager/applicationmanager.pro b/examples/applicationmanager/applicationmanager.pro index 8231c457..49cc2c82 100644 --- a/examples/applicationmanager/applicationmanager.pro +++ b/examples/applicationmanager/applicationmanager.pro @@ -1,3 +1,7 @@ +load(am-config) + +requires(!headless) + TEMPLATE = subdirs SUBDIRS = \ diff --git a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc index d24e956d..e44e5854 100644 --- a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc +++ b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc @@ -83,7 +83,7 @@ The \c appman binary (executable file) is usually located in the Qt installation The \l{QtApplicationManager.SystemUI} module has to be imported to access the application manager APIs. The System UI window has a fixed size and linen background color. Instead of a \l{Rectangle}, the root element could also be a \l{Window}. On top of the background, we display a -\l{applicationmanager/minidesk/system-ui/Readme.qml}{Readme} element with information on the +\c Readme element with information on the features available. At the bottom left there is a textual indication for whether the application manager runs in single-process or multi-process mode. |