Remove obsolete environment variable documentation

Information has been moved into AM_CONFIG, as a YAML string.

Change-Id: Icbc74d2fb3b97ca7c676b86a6a6948cae9c5ab4c
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

5 files changed, 23 insertions, 27 deletions

diff --git a/doc/container.qdoc b/doc/container.qdoc
index cbb8d182..f671b467 100644
--- a/doc/container.qdoc
+++ b/doc/container.qdoc
@@ -124,24 +124,19 @@ the application. A custom container plugin must forward these variables or adjus
   \li Not set, but explicitly unset by the application manager. Make sure to leave it unset, to
       use the automatic Wayland input method implementation.
 \row
-  \li \c{DBUS_SESSION_BUS_ADDRESS}
-  \li The standard D-Bus session bus.
-\row
-  \li \c{AM_DBUS_PEER_ADDRESS}
-  \li Holds the D-Bus socket identifier for the private peer-to-peer bus between the application
-      manager and the application itself. If your container uses its own filesystem namespace,
-      make sure that this socket is forwarded accordingly.
+  \li \c{QT_SCALE_FACTOR}
+  \li Empty (unset), to prevent scaling of wayland clients relative to the compositor. Otherwise
+      running the application manager on a 4K desktop with scaling would result in double-scaled
+      applications within the application manager.
 \row
-  \li \c{AM_DBUS_NOTIFICATION_BUS_ADDRESS}
-  \li Since the \c{org.freedesktop.Notifications} interface could be on a different bus from the
-      rest of the D-Bus interfaces, the application manager needs to explicitly tell the
-      application where to look for this interface.
+  \li \c{QT_WAYLAND_SHELL_INTEGRATION}
+  \li Set to \c{xdg-shell}. This is the preferred wayland shell integration.
 \row
-  \li \c{AM_BASE_DIR}
-  \li The current directory for the application manager.
+  \li \c{DBUS_SESSION_BUS_ADDRESS}
+  \li The standard D-Bus session bus.
 \row
-  \li \c{AM_RUNTIME_SYSTEM_PROPERTIES}
-  \li The public part of the \l{system-properties}{system properties}, encoded as a YAML document.
+  \li \c{AM_CONFIG}
+  \li A YAML, UTF-8 string encoded version of the \l{amConfigDetails}{amConfig} map.
 \row
   \li \c{AM_NO_DLT_LOGGING}
   \li Tells the application to not use DLT for logging.
diff --git a/src/application-lib/applicationinterface.cpp b/src/application-lib/applicationinterface.cpp
index dbef2492..78f7c3c9 100644
--- a/src/application-lib/applicationinterface.cpp
+++ b/src/application-lib/applicationinterface.cpp
@@ -53,8 +53,9 @@
 
     For every application that is started in multi-process mode, the application manager creates
     a private P2P D-Bus connection and communicates the connection address to the application's
-    process via the environment variable \c AM_DBUS_PEER_ADDRESS. Only the application itself is
-    able to connect to this P2P D-Bus - no further access policies are required on this bus.
+    process as part of the YAML snippet in the environment variable \c AM_CONFIG. Only the
+    application itself is able to connect to this P2P D-Bus - no further access policies are
+    required on this bus.
 
     Using this connection, you will have access to different interfaces (note that due to
     this not being a bus, the service name is always an empty string):
diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index 0097dc5d..b88457e2 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -569,7 +569,6 @@ void NativeRuntimeApplicationInterface::finishedInitialization()
 
 NativeRuntimeInterface::NativeRuntimeInterface(NativeRuntime *runtime)
     : QObject(runtime)
-    , m_runtime(runtime)
 { }
 
 
diff --git a/src/manager-lib/nativeruntime_p.h b/src/manager-lib/nativeruntime_p.h
index 2c0e514d..2987e0f8 100644
--- a/src/manager-lib/nativeruntime_p.h
+++ b/src/manager-lib/nativeruntime_p.h
@@ -84,9 +84,6 @@ signals:
     Q_SCRIPTABLE void startApplication(const QString &baseDir, const QString &app, const QString &document,
                                        const QString &mimeType, const QVariantMap &application,
                                        const QVariantMap &systemProperties);
-
-private:
-    NativeRuntime *m_runtime;
 };
 
 QT_END_NAMESPACE_AM
diff --git a/src/plugin-interfaces/containerinterface.cpp b/src/plugin-interfaces/containerinterface.cpp
index ad031e4e..76d11c3d 100644
--- a/src/plugin-interfaces/containerinterface.cpp
+++ b/src/plugin-interfaces/containerinterface.cpp
@@ -191,7 +191,9 @@ ContainerManagerInterface::~ContainerManagerInterface() { }
     You can simply return \a hostPath, if both are running in the same namespace.
 */
 
-/*! \fn bool ContainerInterface::start(const QStringList &arguments, const QMap<QString, QString> &runtimeEnvironment, const QVariantMap &amConfig)
+/*! \fn bool ContainerInterface::start(const QStringList &arguments,
+                                       const QMap<QString, QString> &runtimeEnvironment,
+                                       const QVariantMap &amConfig)
     This function will be called to asynchronously start the application's program (as set by
     setProgram()), with the additional command line \a arguments and with the additional environment
     variables from \a runtimeEnvironment.
@@ -220,7 +222,7 @@ ContainerManagerInterface::~ContainerManagerInterface() { }
       \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).
+      \li A YAML, UTF-8 string encoded version of the \a amConfig map (see below).
     \row
       \li \c AM_NO_DLT_LOGGING
       \li Only set to \c 1, if DLT logging is to be switched off (otherwise not set at all).
@@ -229,10 +231,12 @@ ContainerManagerInterface::~ContainerManagerInterface() { }
     \endtable
 
     The \a amConfig map is a collection of settings that are communicated to the program from the
-    application manager. The same information is already encoded in the \c AM_CONFIG environment
-    variable within \a runtimeEnvironment, but it would be tedious to reparse that YAML fragment
-    in the container plugin.
-    These are the currently defined fields:
+    application manager. The same information is already string encoded in the \c AM_CONFIG
+    environment variable within \a runtimeEnvironment, but it would be tedious to reparse that YAML
+    fragment in the container plugin.
+
+    \target amConfigDetails
+    These are the currently defined fields in amConfig:
 
     \table
     \header