Dont have subdirectories in the extensions folder

This folder is just for the xml files

Change-Id: I20820bac6ed46cb0267b20afddd129ddf64141c5
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/extensions/output-extension/output-extension.xml b/extensions/output-extension.xml
similarity index 100%
rename from extensions/output-extension/output-extension.xml
rename to extensions/output-extension.xml

diff --git a/extensions/surface-extension/surface-extension.xml b/extensions/surface-extension.xml
similarity index 100%
rename from extensions/surface-extension/surface-extension.xml
rename to extensions/surface-extension.xml

diff --git a/extensions/windowmanager/windowmanager.xml b/extensions/windowmanager.xml
similarity index 100%
rename from extensions/windowmanager/windowmanager.xml
rename to extensions/windowmanager.xml

diff --git a/extensions/xcomposite/xcomposite.xml b/extensions/xcomposite.xml
similarity index 100%
rename from extensions/xcomposite/xcomposite.xml
rename to extensions/xcomposite.xml

diff --git a/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri b/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
index 76611ae..6fe78c5 100644 (file)
--- a/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
+++ b/src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-WAYLANDSOURCES += $$PWD/../../../../extensions/xcomposite/xcomposite.xml
+WAYLANDSOURCES += $$PWD/../../../../extensions/xcomposite.xml
 
 HEADERS += \
     $$PWD/xcompositebuffer.h \

diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri
index 4e35462..cf841f9 100644 (file)
--- a/src/compositor/wayland_wrapper/wayland_wrapper.pri
+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri
@@ -1,6 +1,6 @@
 WAYLANDSOURCES += \
-                $$PWD/../../../extensions/surface-extension/surface-extension.xml \
-                $$PWD/../../../extensions/output-extension/output-extension.xml
+                $$PWD/../../../extensions/surface-extension.xml \
+                $$PWD/../../../extensions/output-extension.xml
 
 
 HEADERS += \

diff --git a/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri b/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
index 1b8144a..5489dce 100644 (file)
--- a/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
+++ b/src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-WAYLANDSOURCES += $$PWD/../../../extensions/windowmanager/windowmanager.xml
+WAYLANDSOURCES += $$PWD/../../../extensions/windowmanager.xml
 
 HEADERS += \
     $$PWD/waylandwindowmanagerintegration.h \

diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri
index 1b5b2e6..b40dcf9 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri
@@ -1,6 +1,6 @@
 INCLUDEPATH += $$PWD
 
-WAYLANDSOURCES += $$PWD/../../../../../../extensions/xcomposite/xcomposite.xml
+WAYLANDSOURCES += $$PWD/../../../../../../extensions/xcomposite.xml
 
 HEADERS += \
     $$PWD/qwaylandxcompositebuffer.h

diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 2630b9a..aeef608 100644 (file)
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -16,8 +16,8 @@ mac {
 QT += core-private gui-private platformsupport-private
 
 WAYLANDSOURCES += \
-            $$PWD/../../../../extensions/surface-extension/surface-extension.xml \
-            $$PWD/../../../../extensions/output-extension/output-extension.xml
+            $$PWD/../../../../extensions/surface-extension.xml \
+            $$PWD/../../../../extensions/output-extension.xml
 
 SOURCES =   main.cpp \
             qwaylandintegration.cpp \

diff --git a/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri
index 4110089..ec1db1f 100644 (file)
--- a/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri
+++ b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri
@@ -2,7 +2,7 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
 
 contains(DEFINES, QT_WAYLAND_WINDOWMANAGER_SUPPORT) {
 
-    WAYLANDSOURCES += $$PWD/../../../../../extensions/windowmanager/windowmanager.xml
+    WAYLANDSOURCES += $$PWD/../../../../../extensions/windowmanager.xml
 
     HEADERS += \
         $$PWD/qwaylandwindowmanagerintegration.h