diff options
| author | Jørgen <jorgen.lind@nokia.com> | 2012-01-03 12:30:58 +0100 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-01-04 10:33:51 +0100 |
| commit | 4173bc014581921a8f72083a8ddcbf5870edc178 (patch) | |
| tree | faac3d471de33d8c30e3f87ac2fbdfa59a06b51f | |
| parent | fadf97386c1de82e745894accf352d166a036b80 (diff) | |
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>
| -rw-r--r-- | extensions/output-extension.xml (renamed from extensions/output-extension/output-extension.xml) | 0 | ||||
| -rw-r--r-- | extensions/surface-extension.xml (renamed from extensions/surface-extension/surface-extension.xml) | 0 | ||||
| -rw-r--r-- | extensions/windowmanager.xml (renamed from extensions/windowmanager/windowmanager.xml) | 0 | ||||
| -rw-r--r-- | extensions/xcomposite.xml (renamed from extensions/xcomposite/xcomposite.xml) | 0 | ||||
| -rw-r--r-- | src/compositor/hardware_integration/xcomposite_share/xcomposite_share.pri | 2 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/wayland_wrapper.pri | 4 | ||||
| -rw-r--r-- | src/compositor/windowmanagerprotocol/windowmanagerprotocol.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri | 2 |
10 files changed, 8 insertions, 8 deletions
diff --git a/extensions/output-extension/output-extension.xml b/extensions/output-extension.xml index 32996ea1e..32996ea1e 100644 --- a/extensions/output-extension/output-extension.xml +++ b/extensions/output-extension.xml diff --git a/extensions/surface-extension/surface-extension.xml b/extensions/surface-extension.xml index db150aee4..db150aee4 100644 --- a/extensions/surface-extension/surface-extension.xml +++ b/extensions/surface-extension.xml diff --git a/extensions/windowmanager/windowmanager.xml b/extensions/windowmanager.xml index d9d5b3925..d9d5b3925 100644 --- a/extensions/windowmanager/windowmanager.xml +++ b/extensions/windowmanager.xml diff --git a/extensions/xcomposite/xcomposite.xml b/extensions/xcomposite.xml index 33208075e..33208075e 100644 --- a/extensions/xcomposite/xcomposite.xml +++ b/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 76611ae55..6fe78c588 100644 --- 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 4e35462f5..cf841f914 100644 --- 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 1b8144acd..5489dce21 100644 --- 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 1b5b2e6a3..b40dcf9ca 100644 --- 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 2630b9a96..aeef60839 100644 --- 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 4110089e5..ec1db1fb3 100644 --- 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 |