Remove traces of obsolete config flag "wayland-compositor"

The compositor is always built regardless of this config flag.
Consequently some of the documentation and configuration was
contradicting and confusing.

 * Removes the mentions of the flag from the README
 * Always build compositor tests
 * Always build plugins

Update readme

Change-Id: I37b7d1f0250beb17780834928114ecefdf17684e
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>

3 files changed, 13 insertions, 31 deletions

diff --git a/README b/README
index 5f18509b6..7d9ed16bd 100644
--- a/README
+++ b/README
@@ -5,26 +5,16 @@ The QtWayland module consists of two parts:
 Wayland platform plugin:
     Enables Qt applications to be run as Wayland clients.
 
-QtCompositor API:
+QtWaylandCompositor API:
     Enables the creation of Wayland compositors using Qt and QtQuick.
 
-By default only the Wayland platform plugin is built.  If you want to build the
-experimental QtCompositor API then you need to set the qmake CONFIG variable to
-include "wayland-compositor" when building the QtWayland module:
-
-qmake CONFIG+=wayland-compositor
-make
-
-Note: make sure the source tree is clean before running those commands. If in
-doubt, run git clean -f -d -x.
-
 To build the QtWayland module you need the external dependencies:
 xkbcommon 0.2.0 - http://xkbcommon.org/
 wayland 1.6.0 - http://wayland.freedesktop.org/
 
-QtCompositor supports loading client buffer integrations that don't use the
-wayland-egl interfaces. These client buffer integrations are picked up by
-QtCompositor as plugins. To specify what plugin to load use the environment
+QtWaylandCompositor supports loading client buffer integrations that don't use
+the wayland-egl interfaces. These client buffer integrations are picked up by
+QtWaylandCompositor as plugins. To specify what plugin to load use the environment
 variable QT_WAYLAND_CLIENT_BUFFER_INTEGRATION in the environment where the
 compositor is started. The compositor will broadcast to the clients which
 hardware integration to load when using the generic platformplugin "wayland". If
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 43c02be03..4bee89291 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -7,16 +7,13 @@ config_wayland_egl {
     SUBDIRS += qwayland-egl
 }
 
-#The following integrations are only useful with QtCompositor
-contains(CONFIG, wayland-compositor) {
-    config_brcm_egl: \
-        SUBDIRS += qwayland-brcm-egl
+#The following integrations are only useful with QtWaylandCompositor
+config_brcm_egl: \
+    SUBDIRS += qwayland-brcm-egl
 
-    config_xcomposite {
-        contains(QT_CONFIG, egl): \
-            SUBDIRS += qwayland-xcomposite-egl
-        !contains(QT_CONFIG, opengles2):config_glx: \
-            SUBDIRS += qwayland-xcomposite-glx
-    }
+config_xcomposite {
+    contains(QT_CONFIG, egl): \
+        SUBDIRS += qwayland-xcomposite-egl
+    !contains(QT_CONFIG, opengles2):config_glx: \
+        SUBDIRS += qwayland-xcomposite-glx
 }
-
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c503803b4..a704c7322 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,10 +1,5 @@
 TEMPLATE=subdirs
 
-#Only build compositor test when we are
-#building QtCompositor
-contains(CONFIG, wayland-compositor) {
-    SUBDIRS += compositor
-}
-
 SUBDIRS += client
 SUBDIRS += cmake
+SUBDIRS += compositor