[SCM] kwayland packaging branch, master, updated. debian/4%5.37.0-2-118-ge964566

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:54:52 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwayland.git;a=commitdiff;h=0133a4c

The following commit has been merged in the master branch:
commit 0133a4cbbf4c4bace0a68975fe271270f3a84b45
Merge: 276b01fff3db8a1c63008916da6d13920d2700e6 4f5658a1228d905e0f2374f5df94c0c3befbc84a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Dec 5 03:42:40 2015 -0800

     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:43 +0100 * New upstream release (5.4.2). * Update symbols files from buildds logs (4:5.4.1-1).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:55 +0200 * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:00 +0200 * New upstream release (5.4.0). * Update symbols files.
    -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Sep 2015 10:45:27 +0200 * Team upload. * Updated symbol files to fix FTBFS.
    -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 18 Aug 2015 19:59:54 -0300
    
     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:43 +0100
     * New upstream release (5.4.2).
     * Update symbols files from buildds logs (4:5.4.1-1).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:55 +0200
     * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:00 +0200
     * New upstream release (5.4.0).
     * Update symbols files.
    -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Sep 2015 10:45:27 +0200
     * Team upload.
     * Updated symbol files to fix FTBFS.
    -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 18 Aug 2015 19:59:54 -0300

 debian/changelog                                |  41 ++
 debian/control                                  |   1 -
 debian/libkf5waylandclient5.symbols             | 499 +++++++++++++++++++++++
 debian/libkf5waylandserver5.symbols             | 514 ++++++++++++++++++++++++
 debian/{kwayland-data.install => not-installed} |   0
 debian/tests/testsuite                          |   5 +-
 6 files changed, 1057 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 29ba52f,e89f96c..d93e44a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,38 +1,105 @@@
++kwayland (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
++
++  * Debian merge: No remaining changes. 
++
++ -- Scarlett Clark <sgclark at kubuntu.org>  Sat, 05 Dec 2015 03:35:00 -0800
++
 +kwayland (4:5.4.3-0ubuntu1) xenial; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +  * New upstream bugfix release
 +
 +  [ Philip Muškovac ]
 +  * New upstream bugfix release (LP: #1518598)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:33:34 +0100
 +
+ kwayland (4:5.4.3-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:43 +0100
+ 
 +kwayland (4:5.4.2-0ubuntu2) xenial; urgency=medium
 +
 +  * Fix autopackagetests by adding allow-stderr to the requirements.
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Tue, 03 Nov 2015 15:34:49 +0100
 +
+ kwayland (4:5.4.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.2).
+   * Update symbols files from buildds logs (4:5.4.1-1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:55 +0200
+ 
 +kwayland (4:5.4.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 15:56:12 +0100
 +
+ kwayland (4:5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:45:00 +0200
+ 
 +kwayland (4:5.4.1-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:18:04 +0100
 +
+ kwayland (4:5.4.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 04 Sep 2015 10:45:27 +0200
+ 
 +kwayland (4:5.4.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 31 Aug 2015 15:51:53 +0100
 +
 +kwayland (4:5.3.95-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:15:54 +0200
 +
 +kwayland (4:5.3.2-1ubuntu3) wily; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * Update symbols files: mark as optional the symbols gone after
 +    building with GCC 5
 +
 + -- José Manuel Santamaría Lema <panfaust at gmail.com>  Wed, 22 Jul 2015 19:48:10 +0200
 +
 +kwayland (4:5.3.2-1ubuntu2) wily; urgency=medium
 +
 +  * Add kubuntu_disable-tests.diff to disable failing tests
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 13 Jul 2015 16:32:21 +0200
 +
 +kwayland (4:5.3.2-1ubuntu1) wily; urgency=medium
 +
 +  * Enable weston in debian/tests/control
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 13 Jul 2015 14:07:42 +0200
 +
+ kwayland (4:5.3.2-2) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Martin Steigerwald ]
+   * Updated symbol files to fix FTBFS.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 18 Aug 2015 19:59:54 -0300
+ 
  kwayland (4:5.3.2-1) unstable; urgency=medium
  
    * New upstream release (5.3.2).
diff --cc debian/libkf5waylandclient5.symbols
index 521c0dc,8143aba..e869360
--- a/debian/libkf5waylandclient5.symbols
+++ b/debian/libkf5waylandclient5.symbols
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +# SymbolsHelper-Confirmed: 4:5.4.2+git20151109.2356+15.10 amd64 i386
++=======
+ # SymbolsHelper-Confirmed: 4:5.4.0 amd64
++>>>>>>> master
  libKF5WaylandClient.so.5 libkf5waylandclient5 #MINVER#
   _ZN8KWayland6Client10Compositor10eventQueueEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client10Compositor11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
@@@ -8,7 -8,7 +12,11 @@@
   _ZN8KWayland6Client10Compositor12createRegionERK7QRegionP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client10Compositor13createSurfaceEP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client10Compositor13setEventQueueEPNS0_10EventQueueE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client10Compositor15fromApplicationEP7QObject at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client10Compositor15fromApplicationEP7QObject at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client10Compositor16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client10Compositor5setupEP13wl_compositor at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client10Compositor7destroyEv at Base 4:5.1.1+git20141128.0009
@@@ -122,178 -121,99 +130,272 @@@
   _ZN8KWayland6Client10TouchPointD0Ev at Base 4:5.2.2+git20150326.0109+15.04
   _ZN8KWayland6Client10TouchPointD1Ev at Base 4:5.2.2+git20150326.0109+15.04
   _ZN8KWayland6Client10TouchPointD2Ev at Base 4:5.2.2+git20150326.0109+15.04
++<<<<<<< HEAD
 + _ZN8KWayland6Client11BlurManager10createBlurEPNS0_7SurfaceEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager10eventQueueEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager10removeBlurEPNS0_7SurfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager5setupEP25org_kde_kwin_blur_manager at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager7destroyEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager7releaseEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManager7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManagerC1EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManagerC2EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManagerD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManagerD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManagerD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11BlurManagercvP25org_kde_kwin_blur_managerEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager10eventQueueEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager5setupEP25org_kde_kwin_dpms_manager at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager7destroyEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager7getDpmsEPNS0_6OutputEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager7releaseEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManager7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManagerC1EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManagerC2EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManagerD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManagerD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManagerD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11DpmsManagercvP25org_kde_kwin_dpms_managerEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11IdleTimeout11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout14resumeFromIdleEv at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout20simulateUserActivityEv at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout4idleEv at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout5setupEP25org_kde_kwin_idle_timeout at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7Private10s_listenerE at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7Private12idleCallbackEPvP25org_kde_kwin_idle_timeout at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7Private15resumedCallbackEPvP25org_kde_kwin_idle_timeout at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7Private5setupEP25org_kde_kwin_idle_timeout at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7PrivateC1EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7PrivateC2EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeout7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeoutC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeoutC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeoutD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeoutD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeoutD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client11IdleTimeoutcvP25org_kde_kwin_idle_timeoutEv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell10eventQueueEv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell13createSurfaceEP10wl_surfaceP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell13createSurfaceEPNS0_7SurfaceEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell13setEventQueueEPNS0_10EventQueueE at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell26interfaceAboutToBeReleasedEv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell27interfaceAboutToBeDestroyedEv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell5setupEP20org_kde_plasma_shell at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShell7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client11PlasmaShellC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShellC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShellD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShellD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShellD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client11PlasmaShellcvP20org_kde_plasma_shellEv at Base 4:5.3.95
 + _ZN8KWayland6Client12OutputDevice11modeChangedERKNS1_4ModeE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice11qt_metacastEPKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice11uuidChangedERK10QByteArray at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice14enabledChangedENS1_10EnablementE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice16staticMetaObjectE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice4doneEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice5setupEP25org_kde_kwin_outputdevice at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice6outputEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private11setSubPixelENS1_8SubPixelE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private12doneCallbackEPvP25org_kde_kwin_outputdevice at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private12edidCallbackEPvP25org_kde_kwin_outputdevicePKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private12modeCallbackEPvP25org_kde_kwin_outputdevicejiiii at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private12setTransformENS1_9TransformE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private12uuidCallbackEPvP25org_kde_kwin_outputdevicePKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private13scaleCallbackEPvP25org_kde_kwin_outputdevicei at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private15enabledCallbackEPvP25org_kde_kwin_outputdevicei at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private15setManufacturerERK7QString at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private15setPhysicalSizeERK5QSize at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private16geometryCallbackEPvP25org_kde_kwin_outputdeviceiiiiiPKcS7_i at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private16s_outputListenerE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private17setGlobalPositionERK6QPoint at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private5setupEP25org_kde_kwin_outputdevice at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private7addModeEjiiii at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private8setModelERK7QString at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7Private8setScaleEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7PrivateC1EPS1_ at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7PrivateC2EPS1_ at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7changedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice7removedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevice9modeAddedERKNS1_4ModeE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDeviceC1EP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDeviceC2EP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDeviceD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDeviceD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDeviceD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12OutputDevicecvP25org_kde_kwin_outputdeviceEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12PlasmaWindow11iconChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow12appIdChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow12requestCloseEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow12titleChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow13activeChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow15requestActivateEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow16closeableChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow16keepAboveChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow16keepBelowChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow16maximizedChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow16minimizedChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow17fullscreenChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow18skipTaskbarChangedEv at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Client12PlasmaWindow19maximizeableChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow19minimizeableChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow20onAllDesktopsChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow20setMinimizedGeometryEPNS0_7SurfaceERK5QRect at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12PlasmaWindow21fullscreenableChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow21requestVirtualDesktopEj at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow21virtualDesktopChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow22requestToggleMaximizedEv at Base 4:5.4.2+git20151029.0119+15.10
 + _ZN8KWayland6Client12PlasmaWindow22requestToggleMinimizedEv at Base 4:5.4.2+git20151029.0119+15.10
 + _ZN8KWayland6Client12PlasmaWindow22unsetMinimizedGeometryEPNS0_7SurfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client12PlasmaWindow23demandsAttentionChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private10s_listenerE at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private12setCloseableEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private12setKeepAboveEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private12setKeepBelowEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private12setMaximizedEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private12setMinimizedEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private13setFullscreenEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private14setSkipTaskbarEb at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Client12PlasmaWindow7Private15setMaximizeableEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private15setMinimizeableEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private16setOnAllDesktopsEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private16unmappedCallbackEPvP21org_kde_plasma_window at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private17setFullscreenableEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private19setDemandsAttentionEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private20appIdChangedCallbackEPvP21org_kde_plasma_windowPKc at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private20stateChangedCallbackEPvP21org_kde_plasma_windowj at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private20titleChangedCallbackEPvP21org_kde_plasma_windowPKc at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private29themedIconNameChangedCallbackEPvP21org_kde_plasma_windowPKc at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private29virtualDesktopChangedCallbackEPvP21org_kde_plasma_windowi at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7Private9setActiveEb at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7PrivateC1EP21org_kde_plasma_windowjPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7PrivateC2EP21org_kde_plasma_windowjPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindow8unmappedEv at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindowC1EPNS0_22PlasmaWindowManagementEP21org_kde_plasma_windowj at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindowC2EPNS0_22PlasmaWindowManagementEP21org_kde_plasma_windowj at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindowD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindowD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindowD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client12PlasmaWindowcvP21org_kde_plasma_windowEv at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client11IdleTimeout11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout14resumeFromIdleEv at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout20simulateUserActivityEv at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout4idleEv at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout5setupEP25org_kde_kwin_idle_timeout at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7Private10s_listenerE at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7Private12idleCallbackEPvP25org_kde_kwin_idle_timeout at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7Private15resumedCallbackEPvP25org_kde_kwin_idle_timeout at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7Private5setupEP25org_kde_kwin_idle_timeout at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7PrivateC1EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7PrivateC2EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeout7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeoutC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeoutC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeoutD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeoutD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeoutD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client11IdleTimeoutcvP25org_kde_kwin_idle_timeoutEv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell10eventQueueEv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell13createSurfaceEP10wl_surfaceP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell13createSurfaceEPNS0_7SurfaceEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell26interfaceAboutToBeReleasedEv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell27interfaceAboutToBeDestroyedEv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell5setupEP20org_kde_plasma_shell at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShell7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShellC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShellC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShellD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShellD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShellD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client11PlasmaShellcvP20org_kde_plasma_shellEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow11iconChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow12appIdChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow12requestCloseEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow12titleChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow13activeChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow15requestActivateEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow16closeableChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow16keepAboveChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow16keepBelowChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow16maximizedChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow16minimizedChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow17fullscreenChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow19maximizeableChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow19minimizeableChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow20onAllDesktopsChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow21fullscreenableChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow21requestVirtualDesktopEj at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow21virtualDesktopChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow23demandsAttentionChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private10s_listenerE at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private12setCloseableEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private12setKeepAboveEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private12setKeepBelowEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private12setMaximizedEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private12setMinimizedEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private13setFullscreenEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private15setMaximizeableEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private15setMinimizeableEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private16setOnAllDesktopsEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private16unmappedCallbackEPvP21org_kde_plasma_window at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private17setFullscreenableEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private19setDemandsAttentionEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private20appIdChangedCallbackEPvP21org_kde_plasma_windowPKc at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private20stateChangedCallbackEPvP21org_kde_plasma_windowj at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private20titleChangedCallbackEPvP21org_kde_plasma_windowPKc at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private29themedIconNameChangedCallbackEPvP21org_kde_plasma_windowPKc at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private29virtualDesktopChangedCallbackEPvP21org_kde_plasma_windowi at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7Private9setActiveEb at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7PrivateC1EP21org_kde_plasma_windowjPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7PrivateC2EP21org_kde_plasma_windowjPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindow8unmappedEv at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindowC1EPNS0_22PlasmaWindowManagementEP21org_kde_plasma_windowj at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindowC2EPNS0_22PlasmaWindowManagementEP21org_kde_plasma_windowj at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindowD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindowD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindowD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client12PlasmaWindowcvP21org_kde_plasma_windowEv at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client12ShellSurface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client12ShellSurface11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client12ShellSurface11requestMoveEPNS0_4SeatEj at Base 4:5.4.2+git20151109.2356+15.10
   _ZN8KWayland6Client12ShellSurface11setToplevelEv at Base 4:5.1.95+git20150120.0007+15.04
   _ZN8KWayland6Client12ShellSurface11sizeChangedERK5QSize at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client12ShellSurface12setMaximizedEPNS0_6OutputE at Base 4:5.1.1+git20141216.0026+15.04
@@@ -320,40 -238,22 +422,59 @@@
   _ZN8KWayland6Client12ShellSurfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client12ShellSurfaceD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client12ShellSurfacecvP16wl_shell_surfaceEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client12SlideManager10eventQueueEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager11createSlideEPNS0_7SurfaceEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager11removeSlideEPNS0_7SurfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager5setupEP26org_kde_kwin_slide_manager at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager7destroyEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager7releaseEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManager7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManagerC1EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManagerC2EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManagerD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManagerD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManagerD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client12SlideManagercvP26org_kde_kwin_slide_managerEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client13ShadowManager10eventQueueEv at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager12createShadowEPNS0_7SurfaceEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager12removeShadowEPNS0_7SurfaceE at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager13setEventQueueEPNS0_10EventQueueE at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager5setupEP27org_kde_kwin_shadow_manager at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManager7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client13ShadowManagerC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManagerC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManagerD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManagerD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManagerD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client13ShadowManagercvP27org_kde_kwin_shadow_managerEv at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client13ShadowManager10eventQueueEv at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager12createShadowEPNS0_7SurfaceEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager12removeShadowEPNS0_7SurfaceE at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager5setupEP27org_kde_kwin_shadow_manager at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManager7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManagerC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManagerC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManagerD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManagerD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManagerD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client13ShadowManagercvP27org_kde_kwin_shadow_managerEv at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client13SubCompositor10eventQueueEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client13SubCompositor11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client13SubCompositor11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
@@@ -417,7 -297,7 +538,11 @@@
   _ZN8KWayland6Client16ConnectionThread13setSocketNameERK7QString at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThread14connectionDiedEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThread14initConnectionEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client16ConnectionThread15fromApplicationEP7QObject at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client16ConnectionThread15fromApplicationEP7QObject at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client16ConnectionThread16doInitConnectionEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThread16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThread5flushEv at Base 4:5.2.2+git20150407.0736
@@@ -431,7 -311,7 +556,11 @@@
   _ZN8KWayland6Client16ConnectionThread7PrivateD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThread7displayEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThread9connectedEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client16ConnectionThread9roundtripEv at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client16ConnectionThread9roundtripEv at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client16ConnectionThreadC1EP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThreadC2EP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client16ConnectionThreadD0Ev at Base 4:5.1.1+git20141128.0009
@@@ -470,158 -333,85 +599,240 @@@
   _ZN8KWayland6Client17DataDeviceManagerD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client17DataDeviceManagerD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client17DataDeviceManagercvP22wl_data_device_managerEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client17PlasmaWindowModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel12requestCloseEi at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel15requestActivateEi at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel20setMinimizedGeometryEiPNS0_7SurfaceERK5QRect at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client17PlasmaWindowModel21requestVirtualDesktopEij at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel22requestToggleMaximizedEi at Base 4:5.4.2+git20151029.0119+15.10
 + _ZN8KWayland6Client17PlasmaWindowModel22requestToggleMinimizedEi at Base 4:5.4.2+git20151029.0119+15.10
 + _ZN8KWayland6Client17PlasmaWindowModel7Private11dataChangedEPNS0_12PlasmaWindowEi at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel7Private9addWindowEPNS0_12PlasmaWindowE at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel7PrivateC1EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModel7PrivateC2EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModelC1EPNS0_22PlasmaWindowManagementE at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModelC2EPNS0_22PlasmaWindowManagementE at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModelD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModelD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client17PlasmaWindowModelD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface11setPositionERK6QPoint at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface14setSkipTaskbarEb at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Client18PlasmaShellSurface16setPanelBehaviorENS1_13PanelBehaviorE at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface3getEPNS0_7SurfaceE at Base 4:5.4.1+git20150919.0050+15.10
 + _ZN8KWayland6Client18PlasmaShellSurface5setupEP22org_kde_plasma_surface at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface7Private10s_surfacesE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client18PlasmaShellSurface7Private3getEPNS0_7SurfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client18PlasmaShellSurface7Private5setupEP22org_kde_plasma_surface at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface7PrivateC1EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface7PrivateC2EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface7PrivateD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client18PlasmaShellSurface7PrivateD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client18PlasmaShellSurface7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurface7setRoleENS1_4RoleE at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurfaceC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurfaceC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurfaceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client18PlasmaShellSurfacecvP22org_kde_plasma_surfaceEv at Base 4:5.3.95
 + _ZN8KWayland6Client19OutputConfiguration10eventQueueEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration10setEnabledEPNS0_12OutputDeviceENS2_10EnablementE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration11qt_metacastEPKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration11setPositionEPNS0_12OutputDeviceERK6QPoint at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration12setTransformEPNS0_12OutputDeviceENS2_9TransformE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration16staticMetaObjectE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration5applyEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration5setupEP32org_kde_kwin_outputconfiguration at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration6failedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7Private14failedCallbackEPvP32org_kde_kwin_outputconfiguration at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7Private15appliedCallbackEPvP32org_kde_kwin_outputconfiguration at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7Private29s_outputconfigurationListenerE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7Private5setupEP32org_kde_kwin_outputconfiguration at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7appliedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7destroyEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7releaseEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration7setModeEPNS0_12OutputDeviceEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfiguration8setScaleEPNS0_12OutputDeviceEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfigurationC1EP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfigurationC2EP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfigurationD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfigurationD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfigurationD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client19OutputConfigurationcvP32org_kde_kwin_outputconfigurationEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client22PlasmaWindowManagement10eventQueueEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement11hideDesktopEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement11showDesktopEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement13setEventQueueEPNS0_10EventQueueE at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement13windowCreatedEPNS0_12PlasmaWindowE at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement17createWindowModelEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement17setShowingDesktopEb at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement19activeWindowChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement21showingDesktopChangedEb at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement26interfaceAboutToBeReleasedEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement27interfaceAboutToBeDestroyedEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement5setupEP32org_kde_plasma_window_management at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7Private10s_listenerE at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7Private13windowCreatedEP21org_kde_plasma_windowj at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7Private14setShowDesktopEb at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7Private14windowCallbackEPvP32org_kde_plasma_window_managementj at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7Private19showDesktopCallbackEPvP32org_kde_plasma_window_managementj at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7Private5setupEP32org_kde_plasma_window_management at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7PrivateC1EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7PrivateC2EPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagement7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client22PlasmaWindowManagementC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagementC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagementD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagementD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagementD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client22PlasmaWindowManagementcvP32org_kde_plasma_window_managementEv at Base 4:5.3.95
 + _ZN8KWayland6Client4Blur11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur5setupEP17org_kde_kwin_blur at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur6commitEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur7destroyEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur7releaseEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Blur9setRegionEPNS0_6RegionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4BlurC1EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4BlurC2EP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4BlurD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4BlurD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4BlurD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4BlurcvP17org_kde_kwin_blurEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms11modeChangedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms11requestModeENS1_4ModeE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms16supportedChangedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms5setupEP17org_kde_kwin_dpms at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7Private10s_listenerE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7Private12doneCallbackEPvP17org_kde_kwin_dpms at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7Private12modeCallbackEPvP17org_kde_kwin_dpmsj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7Private17supportedCallbackEPvP17org_kde_kwin_dpmsj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7Private5setupEP17org_kde_kwin_dpms at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7PrivateC1ERK8QPointerINS0_6OutputEEPS1_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7PrivateC2ERK8QPointerINS0_6OutputEEPS1_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7destroyEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Dpms7releaseEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4DpmsC1ERK8QPointerINS0_6OutputEEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4DpmsC2ERK8QPointerINS0_6OutputEEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4DpmsD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4DpmsD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4DpmsD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4DpmscvP17org_kde_kwin_dpmsEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4Idle10eventQueueEv at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle10getTimeoutEjPNS0_4SeatEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle13setEventQueueEPNS0_10EventQueueE at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle5setupEP17org_kde_kwin_idle at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client4Idle7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client4IdleC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client4IdleC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client4IdleD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client4IdleD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client4IdleD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client4IdlecvP17org_kde_kwin_idleEv at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client17PlasmaWindowModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel12requestCloseEi at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel15requestActivateEi at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel21requestVirtualDesktopEij at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel7Private11dataChangedEPNS0_12PlasmaWindowEi at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel7Private9addWindowEPNS0_12PlasmaWindowE at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel7PrivateC1EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModel7PrivateC2EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModelC1EPNS0_22PlasmaWindowManagementE at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModelC2EPNS0_22PlasmaWindowManagementE at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModelD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModelD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client17PlasmaWindowModelD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface11setPositionERK6QPoint at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface16setPanelBehaviorENS1_13PanelBehaviorE at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface5setupEP22org_kde_plasma_surface at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface7Private5setupEP22org_kde_plasma_surface at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface7PrivateC1EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface7PrivateC2EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurface7setRoleENS1_4RoleE at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurfaceC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurfaceC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurfaceD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client18PlasmaShellSurfacecvP22org_kde_plasma_surfaceEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement10eventQueueEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement11hideDesktopEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement11showDesktopEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement13windowCreatedEPNS0_12PlasmaWindowE at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement17createWindowModelEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement17setShowingDesktopEb at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement19activeWindowChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement21showingDesktopChangedEb at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement26interfaceAboutToBeReleasedEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement27interfaceAboutToBeDestroyedEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement5setupEP32org_kde_plasma_window_management at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7Private10s_listenerE at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7Private13windowCreatedEP21org_kde_plasma_windowj at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7Private14setShowDesktopEb at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7Private14windowCallbackEPvP32org_kde_plasma_window_managementj at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7Private19showDesktopCallbackEPvP32org_kde_plasma_window_managementj at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7Private5setupEP32org_kde_plasma_window_management at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7PrivateC1EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7PrivateC2EPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagement7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagementC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagementC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagementD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagementD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagementD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client22PlasmaWindowManagementcvP32org_kde_plasma_window_managementEv at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle10eventQueueEv at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle10getTimeoutEjPNS0_4SeatEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle5setupEP17org_kde_kwin_idle at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client4Idle7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client4IdleC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client4IdleC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client4IdleD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client4IdleD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client4IdleD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client4IdlecvP17org_kde_kwin_idleEv at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client4Seat10eventQueueEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client4Seat11createTouchEP7QObject at Base 4:5.2.2+git20150326.0109+15.04
   _ZN8KWayland6Client4Seat11nameChangedERK7QString at Base 4:5.1.1+git20141128.0009
@@@ -794,44 -565,44 +1005,85 @@@
   _ZN8KWayland6Client6RegionD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client6RegionD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client6RegioncvP9wl_regionEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client6Shadow10attachLeftE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow10attachLeftEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow10attachLeftEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow10setOffsetsERK9QMarginsF at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow11attachRightE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow11attachRightEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow11attachRightEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow12attachBottomE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow12attachBottomEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow12attachBottomEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow13attachTopLeftE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow13attachTopLeftEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow13attachTopLeftEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow14attachTopRightE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow14attachTopRightEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow14attachTopRightEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow16attachBottomLeftE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow16attachBottomLeftEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow16attachBottomLeftEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow17attachBottomRightE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow17attachBottomRightEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow17attachBottomRightEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow5setupEP19org_kde_kwin_shadow at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow6commitEv at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow9attachTopE12QWeakPointerINS0_6BufferEE at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow9attachTopEP9wl_buffer at Base 4:5.3.95
 + _ZN8KWayland6Client6Shadow9attachTopEPNS0_6BufferE at Base 4:5.3.95
 + _ZN8KWayland6Client6ShadowC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client6ShadowC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client6ShadowD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client6ShadowD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client6ShadowD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client6ShadowcvP19org_kde_kwin_shadowEv at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client6Shadow10attachLeftE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow10attachLeftEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow10attachLeftEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow10setOffsetsERK9QMarginsF at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow11attachRightE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow11attachRightEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow11attachRightEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow12attachBottomE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow12attachBottomEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow12attachBottomEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow13attachTopLeftE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow13attachTopLeftEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow13attachTopLeftEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow14attachTopRightE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow14attachTopRightEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow14attachTopRightEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow16attachBottomLeftE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow16attachBottomLeftEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow16attachBottomLeftEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow17attachBottomRightE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow17attachBottomRightEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow17attachBottomRightEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow5setupEP19org_kde_kwin_shadow at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow6commitEv at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow9attachTopE12QWeakPointerINS0_6BufferEE at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow9attachTopEP9wl_buffer at Base 4:5.4.0
+  _ZN8KWayland6Client6Shadow9attachTopEPNS0_6BufferE at Base 4:5.4.0
+  _ZN8KWayland6Client6ShadowC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client6ShadowC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client6ShadowD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client6ShadowD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client6ShadowD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client6ShadowcvP19org_kde_kwin_shadowEv at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client7Pointer10hideCursorEv at Base 4:5.2.1+git20150228.0043+15.04
   _ZN8KWayland6Client7Pointer11axisChangedEjNS1_4AxisEd at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client7Pointer11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
@@@ -887,8 -657,7 +1139,12 @@@
   _ZN8KWayland6Client7ShmPoolD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client7ShmPoolD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client7ShmPoolD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client7Surface10fromWindowEP7QWindow at Base 4:5.3.95
 + (subst)_ZN8KWayland6Client7Surface11fromQtWinIdE{quintptr}@Base 4:5.4.1+git20150917.0854
++=======
+  _ZN8KWayland6Client7Surface10fromWindowEP7QWindow at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client7Surface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client7Surface11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client7Surface11sizeChangedERK5QSize at Base 4:5.1.1+git20141128.0009
@@@ -970,71 -720,53 +1226,111 @@@
   _ZN8KWayland6Client8KeyboardD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8KeyboardD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8KeyboardcvP11wl_keyboardEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client8Registry10createIdleEjjP7QObject at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client8Registry10createIdleEjjP7QObject at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client8Registry10createSeatEjjP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry10eventQueueEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry10shmRemovedEj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry11blurRemovedEj at Base 4:5.4.1+git20150917.0854
   _ZN8KWayland6Client8Registry11createShellEjjP7QObject at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client8Registry11dpmsRemovedEj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry11idleRemovedEj at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client8Registry11idleRemovedEj at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client8Registry11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry11seatRemovedEj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry12createOutputEjjP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry12shellRemovedEj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry12shmAnnouncedEjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry12slideRemovedEj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry13blurAnnouncedEjj at Base 4:5.4.1+git20150917.0854
   _ZN8KWayland6Client8Registry13createShmPoolEjjP7QObject at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client8Registry13dpmsAnnouncedEjj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry13idleAnnouncedEjj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry13outputRemovedEj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry13seatAnnouncedEjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry13setEventQueueEPNS0_10EventQueueE at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry13shadowRemovedEj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry14shellAnnouncedEjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry14slideAnnouncedEjj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry15contrastRemovedEj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry15createFakeInputEjjP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry15outputAnnouncedEjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry15shadowAnnouncedEjj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry16createCompositorEjjP7QObject at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry16fakeInputRemovedEj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry16interfaceRemovedEj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry17compositorRemovedEj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry17contrastAnnouncedEjj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry17createBlurManagerEjjP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry17createDpmsManagerEjjP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry17createPlasmaShellEjjP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry18createOutputDeviceEjjP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client8Registry18createSlideManagerEjjP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client8Registry18fakeInputAnnouncedEjj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry18interfaceAnnouncedE10QByteArrayjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry18plasmaShellRemovedEj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry19compositorAnnouncedEjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry19createShadowManagerEjjP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry19createSubCompositorEjjP7QObject at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry19interfacesAnnouncedEv at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry19outputDeviceRemovedEj at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client8Registry20plasmaShellAnnouncedEjj at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client8Registry13idleAnnouncedEjj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry13outputRemovedEj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry13seatAnnouncedEjj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry13setEventQueueEPNS0_10EventQueueE at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry13shadowRemovedEj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry14shellAnnouncedEjj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry15createFakeInputEjjP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry15outputAnnouncedEjj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry15shadowAnnouncedEjj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry16createCompositorEjjP7QObject at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry16fakeInputRemovedEj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry16interfaceRemovedEj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry17compositorRemovedEj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry17createPlasmaShellEjjP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry18fakeInputAnnouncedEjj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry18interfaceAnnouncedE10QByteArrayjj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry18plasmaShellRemovedEj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry19compositorAnnouncedEjj at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry19createShadowManagerEjjP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry19createSubCompositorEjjP7QObject at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry19interfacesAnnouncedEv at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Client8Registry20plasmaShellAnnouncedEjj at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client8Registry20subCompositorRemovedEj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry21createContrastManagerEjjP7QObject at Base 4:5.4.1+git20150917.0854
   _ZN8KWayland6Client8Registry21createFullscreenShellEjjP7QObject at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry21outputDeviceAnnouncedEjj at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Client8Registry22createOutputManagementEjjP7QObject at Base 4:5.4.2+git20151109.2356+15.10
   _ZN8KWayland6Client8Registry22fullscreenShellRemovedEj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry22subCompositorAnnouncedEjj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry23createDataDeviceManagerEjjP7QObject at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry23outputManagementRemovedEj at Base 4:5.4.2+git20151109.2356+15.10
   _ZN8KWayland6Client8Registry24dataDeviceManagerRemovedEj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry24fullscreenShellAnnouncedEjj at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Client8Registry25outputManagementAnnouncedEjj at Base 4:5.4.2+git20151109.2356+15.10
   _ZN8KWayland6Client8Registry26dataDeviceManagerAnnouncedEjj at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client8Registry28createPlasmaWindowManagementEjjP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry29plasmaWindowManagementRemovedEj at Base 4:5.3.95
 + _ZN8KWayland6Client8Registry31plasmaWindowManagementAnnouncedEjj at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client8Registry28createPlasmaWindowManagementEjjP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry29plasmaWindowManagementRemovedEj at Base 4:5.4.0
+  _ZN8KWayland6Client8Registry31plasmaWindowManagementAnnouncedEjj at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Client8Registry5setupEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry6createEP10wl_display at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client8Registry6createEPNS0_16ConnectionThreadE at Base 4:5.1.1+git20141128.0009
@@@ -1077,31 -809,30 +1373,58 @@@
   _ZN8KWayland6Client9DataOfferD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client9DataOfferD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Client9DataOffercvP13wl_data_offerEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Client9FakeInput10eventQueueEv at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput12authenticateERK7QStringS4_ at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput13setEventQueueEPNS0_10EventQueueE at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput18requestPointerAxisEN2Qt11OrientationEd at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput18requestPointerMoveERK6QSizeF at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput25requestPointerButtonClickEN2Qt11MouseButtonE at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput25requestPointerButtonClickEj at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput25requestPointerButtonPressEN2Qt11MouseButtonE at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput25requestPointerButtonPressEj at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput27requestPointerButtonReleaseEN2Qt11MouseButtonE at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput27requestPointerButtonReleaseEj at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput5setupEP23org_kde_kwin_fake_input at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput7Private22sendPointerButtonStateEN2Qt11MouseButtonEj at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput7destroyEv at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput7releaseEv at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInput7removedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Client9FakeInputC1EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInputC2EP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInputD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInputD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInputD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Client9FakeInputcvP23org_kde_kwin_fake_inputEv at Base 4:5.3.95
++=======
+  _ZN8KWayland6Client9FakeInput10eventQueueEv at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput12authenticateERK7QStringS4_ at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput13setEventQueueEPNS0_10EventQueueE at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput18requestPointerAxisEN2Qt11OrientationEd at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput18requestPointerMoveERK6QSizeF at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput25requestPointerButtonClickEN2Qt11MouseButtonE at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput25requestPointerButtonClickEj at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput25requestPointerButtonPressEN2Qt11MouseButtonE at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput25requestPointerButtonPressEj at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput27requestPointerButtonReleaseEN2Qt11MouseButtonE at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput27requestPointerButtonReleaseEj at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput5setupEP23org_kde_kwin_fake_input at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput7Private22sendPointerButtonStateEN2Qt11MouseButtonEj at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput7destroyEv at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInput7releaseEv at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInputC1EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInputC2EP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInputD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInputD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInputD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Client9FakeInputcvP23org_kde_kwin_fake_inputEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client10Compositor10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client10Compositor7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client10CompositorcvP13wl_compositorEv at Base 4:5.1.1+git20141128.0009
@@@ -1130,69 -861,39 +1453,104 @@@
   _ZNK8KWayland6Client10TouchPoint8positionEv at Base 4:5.2.2+git20150326.0109+15.04
   _ZNK8KWayland6Client10TouchPoint8upSerialEv at Base 4:5.2.2+git20150326.0109+15.04
   _ZNK8KWayland6Client10TouchPoint9positionsEv at Base 4:5.2.2+git20150326.0109+15.04
++<<<<<<< HEAD
 + _ZNK8KWayland6Client11BlurManager10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client11BlurManager7isValidEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client11BlurManagercvP25org_kde_kwin_blur_managerEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client11DpmsManager10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client11DpmsManager7isValidEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client11DpmsManagercvP25org_kde_kwin_dpms_managerEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client11IdleTimeout10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client11IdleTimeout7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client11IdleTimeoutcvP25org_kde_kwin_idle_timeoutEv at Base 4:5.3.95
 + _ZNK8KWayland6Client11PlasmaShell10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client11PlasmaShell7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client11PlasmaShellcvP20org_kde_plasma_shellEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12OutputDevice10eventQueueEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice10metaObjectEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice11currentModeEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice11refreshRateEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice12manufacturerEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice12physicalSizeEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice14globalPositionEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice4ModeeqERKS2_ at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice4edidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice4uuidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice5modelEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice5modesEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice5scaleEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice7enabledEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice7isValidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice8geometryEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice8subPixelEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice9pixelSizeEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevice9transformEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12OutputDevicecvP25org_kde_kwin_outputdeviceEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client12PlasmaWindow10internalIdEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow11isCloseableEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow11isKeepAboveEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow11isKeepBelowEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow11isMaximizedEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow11isMinimizedEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow11skipTaskbarEv at Base 4:5.4.1+git20151001.0029+15.10
 + _ZNK8KWayland6Client12PlasmaWindow12isFullscreenEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow14isMaximizeableEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow14isMinimizeableEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow14virtualDesktopEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow15isOnAllDesktopsEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow16isFullscreenableEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow20isDemandingAttentionEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow4iconEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow5appIdEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow5titleEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindow8isActiveEv at Base 4:5.3.95
 + _ZNK8KWayland6Client12PlasmaWindowcvP21org_kde_plasma_windowEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client11IdleTimeout10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client11IdleTimeout7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client11IdleTimeoutcvP25org_kde_kwin_idle_timeoutEv at Base 4:5.4.0
+  _ZNK8KWayland6Client11PlasmaShell10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client11PlasmaShell7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client11PlasmaShellcvP20org_kde_plasma_shellEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow10internalIdEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow11isCloseableEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow11isKeepAboveEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow11isKeepBelowEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow11isMaximizedEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow11isMinimizedEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow12isFullscreenEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow14isMaximizeableEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow14isMinimizeableEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow14virtualDesktopEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow15isOnAllDesktopsEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow16isFullscreenableEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow20isDemandingAttentionEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow4iconEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow5appIdEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow5titleEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindow8isActiveEv at Base 4:5.4.0
+  _ZNK8KWayland6Client12PlasmaWindowcvP21org_kde_plasma_windowEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client12ShellSurface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client12ShellSurface4sizeEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client12ShellSurface7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client12ShellSurfacecvP16wl_shell_surfaceEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client12SlideManager10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client12SlideManager7isValidEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client12SlideManagercvP26org_kde_kwin_slide_managerEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client13ShadowManager10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client13ShadowManager7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client13ShadowManagercvP27org_kde_kwin_shadow_managerEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client13ShadowManager10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client13ShadowManager7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client13ShadowManagercvP27org_kde_kwin_shadow_managerEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client13SubCompositor10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client13SubCompositor7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client13SubCompositorcvP16wl_subcompositorEv at Base 4:5.1.1+git20141128.0009
@@@ -1212,36 -906,23 +1570,56 @@@
   _ZNK8KWayland6Client17DataDeviceManager10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client17DataDeviceManager7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client17DataDeviceManagercvP22wl_data_device_managerEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client17PlasmaWindowModel10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client17PlasmaWindowModel4dataERK11QModelIndexi at Base 4:5.3.95
 + _ZNK8KWayland6Client17PlasmaWindowModel5indexEiiRK11QModelIndex at Base 4:5.3.95
 + _ZNK8KWayland6Client17PlasmaWindowModel8rowCountERK11QModelIndex at Base 4:5.3.95
 + _ZNK8KWayland6Client17PlasmaWindowModel9roleNamesEv at Base 4:5.3.95
 + _ZNK8KWayland6Client18PlasmaShellSurface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client18PlasmaShellSurface4roleEv at Base 4:5.4.1+git20150919.0050+15.10
 + _ZNK8KWayland6Client18PlasmaShellSurface7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client18PlasmaShellSurfacecvP22org_kde_plasma_surfaceEv at Base 4:5.3.95
 + _ZNK8KWayland6Client19OutputConfiguration10metaObjectEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client19OutputConfiguration7isValidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client19OutputConfigurationcvP32org_kde_kwin_outputconfigurationEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client22PlasmaWindowManagement10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client22PlasmaWindowManagement12activeWindowEv at Base 4:5.3.95
 + _ZNK8KWayland6Client22PlasmaWindowManagement16isShowingDesktopEv at Base 4:5.3.95
 + _ZNK8KWayland6Client22PlasmaWindowManagement7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client22PlasmaWindowManagement7windowsEv at Base 4:5.3.95
 + _ZNK8KWayland6Client22PlasmaWindowManagementcvP32org_kde_plasma_window_managementEv at Base 4:5.3.95
 + _ZNK8KWayland6Client4Blur10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Blur7isValidEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4BlurcvP17org_kde_kwin_blurEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Dpms10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Dpms11isSupportedEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Dpms4modeEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Dpms6outputEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Dpms7isValidEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4DpmscvP17org_kde_kwin_dpmsEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client4Idle10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client4Idle7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client4IdlecvP17org_kde_kwin_idleEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client17PlasmaWindowModel10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client17PlasmaWindowModel4dataERK11QModelIndexi at Base 4:5.4.0
+  _ZNK8KWayland6Client17PlasmaWindowModel5indexEiiRK11QModelIndex at Base 4:5.4.0
+  _ZNK8KWayland6Client17PlasmaWindowModel8rowCountERK11QModelIndex at Base 4:5.4.0
+  _ZNK8KWayland6Client17PlasmaWindowModel9roleNamesEv at Base 4:5.4.0
+  _ZNK8KWayland6Client18PlasmaShellSurface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client18PlasmaShellSurface7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client18PlasmaShellSurfacecvP22org_kde_plasma_surfaceEv at Base 4:5.4.0
+  _ZNK8KWayland6Client22PlasmaWindowManagement10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client22PlasmaWindowManagement12activeWindowEv at Base 4:5.4.0
+  _ZNK8KWayland6Client22PlasmaWindowManagement16isShowingDesktopEv at Base 4:5.4.0
+  _ZNK8KWayland6Client22PlasmaWindowManagement7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client22PlasmaWindowManagement7windowsEv at Base 4:5.4.0
+  _ZNK8KWayland6Client22PlasmaWindowManagementcvP32org_kde_plasma_window_managementEv at Base 4:5.4.0
+  _ZNK8KWayland6Client4Idle10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client4Idle7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client4IdlecvP17org_kde_kwin_idleEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client4Seat10hasPointerEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client4Seat10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client4Seat11hasKeyboardEv at Base 4:5.1.1+git20141128.0009
@@@ -1287,9 -964,9 +1665,15 @@@
   _ZNK8KWayland6Client6Region6regionEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client6Region7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client6RegioncvP9wl_regionEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client6Shadow10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client6Shadow7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client6ShadowcvP19org_kde_kwin_shadowEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client6Shadow10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client6Shadow7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client6ShadowcvP19org_kde_kwin_shadowEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client7Pointer10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client7Pointer14enteredSurfaceEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client7Pointer7isValidEv at Base 4:5.1.1+git20141128.0009
@@@ -1298,7 -975,7 +1682,11 @@@
   _ZNK8KWayland6Client7ShmPool11poolAddressEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client7ShmPool7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client7Surface10metaObjectEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client7Surface2idEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client7Surface2idEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client7Surface4sizeEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client7Surface7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client7SurfacecvP10wl_surfaceEv at Base 4:5.1.1+git20141128.0009
@@@ -1313,94 -984,68 +1701,144 @@@
   _ZNK8KWayland6Client8Keyboard7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client8KeyboardcvP11wl_keyboardEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client8Registry10bindOutputEjj at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Client8Registry10interfacesENS1_9InterfaceE at Base 4:5.4.1+git20150917.0854
   _ZNK8KWayland6Client8Registry10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client8Registry12hasInterfaceENS1_9InterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client8Registry13bindFakeInputEjj at Base 4:5.3.95
 + _ZNK8KWayland6Client8Registry14bindCompositorEjj at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Client8Registry15bindBlurManagerEjj at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client8Registry15bindDpmsManagerEjj at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client8Registry15bindPlasmaShellEjj at Base 4:5.3.95
 + _ZNK8KWayland6Client8Registry16bindOutputDeviceEjj at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Client8Registry16bindSlideManagerEjj at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client8Registry17bindShadowManagerEjj at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client8Registry13bindFakeInputEjj at Base 4:5.4.0
+  _ZNK8KWayland6Client8Registry14bindCompositorEjj at Base 4:5.1.1+git20141128.0009
+  _ZNK8KWayland6Client8Registry15bindPlasmaShellEjj at Base 4:5.4.0
+  _ZNK8KWayland6Client8Registry17bindShadowManagerEjj at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client8Registry17bindSubCompositorEjj at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Client8Registry19bindContrastManagerEjj at Base 4:5.4.1+git20150917.0854
   _ZNK8KWayland6Client8Registry19bindFullscreenShellEjj at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Client8Registry20bindOutputManagementEjj at Base 4:5.4.2+git20151109.2356+15.10
   _ZNK8KWayland6Client8Registry21bindDataDeviceManagerEjj at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client8Registry26bindPlasmaWindowManagementEjj at Base 4:5.3.95
 + _ZNK8KWayland6Client8Registry7Private10interfacesENS1_9InterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Client8Registry7Private12hasInterfaceENS1_9InterfaceE at Base 4:5.1.1+git20141128.0009
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI13wl_compositorEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI16wl_subcompositorEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI17org_kde_kwin_idleEEPT_NS1_9InterfaceEjj at Base 4:5.3.95
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI20_wl_fullscreen_shellEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI20org_kde_plasma_shellEEPT_NS1_9InterfaceEjj at Base 4:5.3.95
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI22wl_data_device_managerEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI23org_kde_kwin_fake_inputEEPT_NS1_9InterfaceEjj at Base 4:5.3.95
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI25org_kde_kwin_blur_managerEEPT_NS1_9InterfaceEjj at Base 4:5.4.1+git20150917.0854
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI25org_kde_kwin_dpms_managerEEPT_NS1_9InterfaceEjj at Base 4:5.4.1+git20150917.0854
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI25org_kde_kwin_outputdeviceEEPT_NS1_9InterfaceEjj at Base 4:5.4.2+git20151109.2356+15.10
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI26org_kde_kwin_slide_managerEEPT_NS1_9InterfaceEjj at Base 4:5.4.1+git20150917.0854
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI27org_kde_kwin_shadow_managerEEPT_NS1_9InterfaceEjj at Base 4:5.3.95
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI29org_kde_kwin_contrast_managerEEPT_NS1_9InterfaceEjj at Base 4:5.4.1+git20150917.0854
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI29org_kde_kwin_outputmanagementEEPT_NS1_9InterfaceEjj at Base 4:5.4.2+git20151109.2356+15.10
 + (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI32org_kde_plasma_window_managementEEPT_NS1_9InterfaceEjj at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client8Registry26bindPlasmaWindowManagementEjj at Base 4:5.4.0
+  _ZNK8KWayland6Client8Registry7Private12hasInterfaceENS1_9InterfaceE at Base 4:5.1.1+git20141128.0009
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI13wl_compositorEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI16wl_subcompositorEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI17org_kde_kwin_idleEEPT_NS1_9InterfaceEjj at Base 4:5.4.0
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI20_wl_fullscreen_shellEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI20org_kde_plasma_shellEEPT_NS1_9InterfaceEjj at Base 4:5.4.0
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI22wl_data_device_managerEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI23org_kde_kwin_fake_inputEEPT_NS1_9InterfaceEjj at Base 4:5.4.0
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI27org_kde_kwin_shadow_managerEEPT_NS1_9InterfaceEjj at Base 4:5.4.0
+  (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI32org_kde_plasma_window_managementEEPT_NS1_9InterfaceEjj at Base 4:5.4.0
++>>>>>>> master
   (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI6wl_shmEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
   (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI7wl_seatEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
   (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI8wl_shellEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
   (optional=templinst)_ZNK8KWayland6Client8Registry7Private4bindI9wl_outputEEPT_NS1_9InterfaceEjj at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Client8Registry7Private9interfaceENS1_9InterfaceE at Base 4:5.4.1+git20150917.0854
   _ZNK8KWayland6Client8Registry7bindShmEjj at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client8Registry7isValidEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client8Registry8bindIdleEjj at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client8Registry8bindIdleEjj at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Client8Registry8bindSeatEjj at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client8Registry9bindShellEjj at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Client8Registry9interfaceENS1_9InterfaceE at Base 4:5.4.1+git20150917.0854
   _ZNK8KWayland6Client8RegistrycvP11wl_registryEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client9DataOffer10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client9DataOffer16offeredMimeTypesEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client9DataOffer7isValidEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Client9DataOffercvP13wl_data_offerEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Client9FakeInput10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Client9FakeInput7isValidEv at Base 4:5.3.95
 + _ZNK8KWayland6Client9FakeInputcvP23org_kde_kwin_fake_inputEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Client9FakeInput10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Client9FakeInput7isValidEv at Base 4:5.4.0
+  _ZNK8KWayland6Client9FakeInputcvP23org_kde_kwin_fake_inputEv at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Client10CompositorE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client10DataDeviceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client10DataSourceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client10EventQueueE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client10SubSurfaceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client10TouchPointE at Base 4:5.2.2+git20150326.0109+15.04
++<<<<<<< HEAD
 + _ZTIN8KWayland6Client11BlurManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Client11DpmsManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Client11IdleTimeoutE at Base 4:5.3.95
 + _ZTIN8KWayland6Client11PlasmaShellE at Base 4:5.3.95
 + _ZTIN8KWayland6Client12OutputDeviceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Client12PlasmaWindowE at Base 4:5.3.95
 + _ZTIN8KWayland6Client12ShellSurfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Client12SlideManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Client13ShadowManagerE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Client11IdleTimeoutE at Base 4:5.4.0
+  _ZTIN8KWayland6Client11PlasmaShellE at Base 4:5.4.0
+  _ZTIN8KWayland6Client12PlasmaWindowE at Base 4:5.4.0
+  _ZTIN8KWayland6Client12ShellSurfaceE at Base 4:5.1.1+git20141128.0009
+  _ZTIN8KWayland6Client13ShadowManagerE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Client13SubCompositorE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Client15ContrastManagerE at Base 4:5.4.1+git20150917.0854
   _ZTIN8KWayland6Client15FullscreenShellE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client16ConnectionThreadE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Client16OutputManagementE at Base 4:5.4.2+git20151109.2356+15.10
   _ZTIN8KWayland6Client17DataDeviceManagerE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Client17PlasmaWindowModelE at Base 4:5.3.95
 + _ZTIN8KWayland6Client18PlasmaShellSurfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Client19OutputConfigurationE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Client22PlasmaWindowManagementE at Base 4:5.3.95
 + _ZTIN8KWayland6Client4BlurE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Client4DpmsE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Client4IdleE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Client17PlasmaWindowModelE at Base 4:5.4.0
+  _ZTIN8KWayland6Client18PlasmaShellSurfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Client22PlasmaWindowManagementE at Base 4:5.4.0
+  _ZTIN8KWayland6Client4IdleE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Client4SeatE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client5ShellE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Client5SlideE at Base 4:5.4.1+git20150917.0854
   _ZTIN8KWayland6Client5TouchE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTIN8KWayland6Client6OutputE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client6RegionE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Client6ShadowE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Client6ShadowE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Client7PointerE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client7ShmPoolE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client7SurfaceE at Base 4:5.1.1+git20141128.0009
@@@ -1408,42 -1052,32 +1846,65 @@@
   _ZTIN8KWayland6Client8KeyboardE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client8RegistryE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Client9DataOfferE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Client9FakeInputE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Client9FakeInputE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Client10CompositorE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client10DataDeviceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client10DataSourceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client10EventQueueE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client10SubSurfaceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client10TouchPointE at Base 4:5.2.2+git20150326.0109+15.04
++<<<<<<< HEAD
 + _ZTSN8KWayland6Client11BlurManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Client11DpmsManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Client11IdleTimeoutE at Base 4:5.3.95
 + _ZTSN8KWayland6Client11PlasmaShellE at Base 4:5.3.95
 + _ZTSN8KWayland6Client12OutputDeviceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Client12PlasmaWindowE at Base 4:5.3.95
 + _ZTSN8KWayland6Client12ShellSurfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Client12SlideManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Client13ShadowManagerE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Client11IdleTimeoutE at Base 4:5.4.0
+  _ZTSN8KWayland6Client11PlasmaShellE at Base 4:5.4.0
+  _ZTSN8KWayland6Client12PlasmaWindowE at Base 4:5.4.0
+  _ZTSN8KWayland6Client12ShellSurfaceE at Base 4:5.1.1+git20141128.0009
+  _ZTSN8KWayland6Client13ShadowManagerE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Client13SubCompositorE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Client15ContrastManagerE at Base 4:5.4.1+git20150917.0854
   _ZTSN8KWayland6Client15FullscreenShellE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client16ConnectionThreadE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Client16OutputManagementE at Base 4:5.4.2+git20151109.2356+15.10
   _ZTSN8KWayland6Client17DataDeviceManagerE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Client17PlasmaWindowModelE at Base 4:5.3.95
 + _ZTSN8KWayland6Client18PlasmaShellSurfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Client19OutputConfigurationE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Client22PlasmaWindowManagementE at Base 4:5.3.95
 + _ZTSN8KWayland6Client4BlurE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Client4DpmsE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Client4IdleE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Client17PlasmaWindowModelE at Base 4:5.4.0
+  _ZTSN8KWayland6Client18PlasmaShellSurfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Client22PlasmaWindowManagementE at Base 4:5.4.0
+  _ZTSN8KWayland6Client4IdleE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Client4SeatE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client5ShellE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Client5SlideE at Base 4:5.4.1+git20150917.0854
   _ZTSN8KWayland6Client5TouchE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTSN8KWayland6Client6OutputE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client6RegionE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Client6ShadowE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Client6ShadowE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Client7PointerE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client7ShmPoolE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client7SurfaceE at Base 4:5.1.1+git20141128.0009
@@@ -1451,42 -1084,32 +1912,65 @@@
   _ZTSN8KWayland6Client8KeyboardE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client8RegistryE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Client9DataOfferE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Client9FakeInputE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Client9FakeInputE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Client10CompositorE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client10DataDeviceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client10DataSourceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client10EventQueueE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client10SubSurfaceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client10TouchPointE at Base 4:5.2.2+git20150326.0109+15.04
++<<<<<<< HEAD
 + _ZTVN8KWayland6Client11BlurManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Client11DpmsManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Client11IdleTimeoutE at Base 4:5.3.95
 + _ZTVN8KWayland6Client11PlasmaShellE at Base 4:5.3.95
 + _ZTVN8KWayland6Client12OutputDeviceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Client12PlasmaWindowE at Base 4:5.3.95
 + _ZTVN8KWayland6Client12ShellSurfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Client12SlideManagerE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Client13ShadowManagerE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Client11IdleTimeoutE at Base 4:5.4.0
+  _ZTVN8KWayland6Client11PlasmaShellE at Base 4:5.4.0
+  _ZTVN8KWayland6Client12PlasmaWindowE at Base 4:5.4.0
+  _ZTVN8KWayland6Client12ShellSurfaceE at Base 4:5.1.1+git20141128.0009
+  _ZTVN8KWayland6Client13ShadowManagerE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Client13SubCompositorE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Client15ContrastManagerE at Base 4:5.4.1+git20150917.0854
   _ZTVN8KWayland6Client15FullscreenShellE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client16ConnectionThreadE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Client16OutputManagementE at Base 4:5.4.2+git20151109.2356+15.10
   _ZTVN8KWayland6Client17DataDeviceManagerE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Client17PlasmaWindowModelE at Base 4:5.3.95
 + _ZTVN8KWayland6Client18PlasmaShellSurfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Client19OutputConfigurationE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Client22PlasmaWindowManagementE at Base 4:5.3.95
 + _ZTVN8KWayland6Client4BlurE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Client4DpmsE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Client4IdleE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Client17PlasmaWindowModelE at Base 4:5.4.0
+  _ZTVN8KWayland6Client18PlasmaShellSurfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Client22PlasmaWindowManagementE at Base 4:5.4.0
+  _ZTVN8KWayland6Client4IdleE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Client4SeatE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client5ShellE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Client5SlideE at Base 4:5.4.1+git20150917.0854
   _ZTVN8KWayland6Client5TouchE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTVN8KWayland6Client6OutputE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client6RegionE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Client6ShadowE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Client6ShadowE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Client7PointerE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client7ShmPoolE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client7SurfaceE at Base 4:5.1.1+git20141128.0009
@@@ -1494,26 -1116,15 +1978,41 @@@
   _ZTVN8KWayland6Client8KeyboardE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client8RegistryE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Client9DataOfferE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Client9FakeInputE at Base 4:5.3.95
 + _wl_fullscreen_shell_interface at Base 4:5.1.1+git20141128.0009
 + _wl_fullscreen_shell_mode_feedback_interface at Base 4:5.1.1+git20141128.0009
 + org_kde_kwin_blur_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_blur_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_contrast_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_contrast_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_dpms_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_dpms_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_fake_input_interface at Base 4:5.3.95
 + org_kde_kwin_idle_interface at Base 4:5.3.95
 + org_kde_kwin_idle_timeout_interface at Base 4:5.3.95
 + org_kde_kwin_outputconfiguration_interface at Base 4:5.4.2+git20151109.2356+15.10
 + org_kde_kwin_outputdevice_interface at Base 4:5.4.2+git20151109.2356+15.10
 + org_kde_kwin_outputmanagement_interface at Base 4:5.4.2+git20151109.2356+15.10
 + org_kde_kwin_shadow_interface at Base 4:5.3.95
 + org_kde_kwin_shadow_manager_interface at Base 4:5.3.95
 + org_kde_kwin_slide_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_slide_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_plasma_shell_interface at Base 4:5.3.95
 + org_kde_plasma_surface_interface at Base 4:5.3.95
 + org_kde_plasma_window_interface at Base 4:5.3.95
 + org_kde_plasma_window_management_interface at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Client9FakeInputE at Base 4:5.4.0
+  _wl_fullscreen_shell_interface at Base 4:5.1.1+git20141128.0009
+  _wl_fullscreen_shell_mode_feedback_interface at Base 4:5.1.1+git20141128.0009
+  org_kde_kwin_fake_input_interface at Base 4:5.4.0
+  org_kde_kwin_idle_interface at Base 4:5.4.0
+  org_kde_kwin_idle_timeout_interface at Base 4:5.4.0
+  org_kde_kwin_shadow_interface at Base 4:5.4.0
+  org_kde_kwin_shadow_manager_interface at Base 4:5.4.0
+  org_kde_plasma_shell_interface at Base 4:5.4.0
+  org_kde_plasma_surface_interface at Base 4:5.4.0
+  org_kde_plasma_window_interface at Base 4:5.4.0
+  org_kde_plasma_window_management_interface at Base 4:5.4.0
++>>>>>>> master
diff --cc debian/libkf5waylandserver5.symbols
index fa71ecb,f9daf3c..c80bf02
--- a/debian/libkf5waylandserver5.symbols
+++ b/debian/libkf5waylandserver5.symbols
@@@ -1,39 -1,19 +1,58 @@@
++<<<<<<< HEAD
 +# SymbolsHelper-Confirmed: 4:5.4.3+git20151202.0927+16.04 amd64 i386
 +libKF5WaylandServer.so.5 libkf5waylandserver5 #MINVER#
 + _ZN8KWayland6Server13BlurInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface6regionEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7Private11s_interfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7Private14commitCallbackEP9wl_clientP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7Private15releaseCallbackEP9wl_clientP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7Private17setRegionCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7Private6commitEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7PrivateC1EPS1_PNS0_20BlurManagerInterfaceEP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7PrivateC2EPS1_PNS0_20BlurManagerInterfaceEP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7PrivateD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7PrivateD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterface7PrivateD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterfaceC1EPNS0_20BlurManagerInterfaceEP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterfaceC2EPNS0_20BlurManagerInterfaceEP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterfaceD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterfaceD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13BlurInterfaceD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13IdleInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface7Private22getIdleTimeoutCallbackEP9wl_clientP11wl_resourcejS6_j at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface7Private4bindEP9wl_clientjj at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface7Private6unbindEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server13IdleInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server13IdleInterfaceD2Ev at Base 4:5.3.95
++=======
+ # SymbolsHelper-Confirmed: 4:5.4.1 alpha arm64 armel armhf hppa i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x
+ libKF5WaylandServer.so.5 libkf5waylandserver5 #MINVER#
+  _ZN8KWayland6Server13IdleInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface7Private22getIdleTimeoutCallbackEP9wl_clientP11wl_resourcejS6_j at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface7Private4bindEP9wl_clientjj at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface7Private6unbindEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server13IdleInterfaceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server13SeatInterface10keyPressedEj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server13SeatInterface10touchFrameEv at Base 4:5.2.2+git20150326.0109+15.04
   _ZN8KWayland6Server13SeatInterface11keyReleasedEj at Base 4:5.1.1+git20141128.0009
@@@ -180,38 -136,25 +199,58 @@@
   _ZN8KWayland6Server15BufferInterfaceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15BufferInterfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15BufferInterfaceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server15FakeInputDevice11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice17setAuthenticationEb at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice20pointerAxisRequestedEN2Qt11OrientationEd at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice22pointerMotionRequestedERK6QSizeF at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice23authenticationRequestedERK7QStringS4_ at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice27pointerButtonPressRequestedEj at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice29pointerButtonReleaseRequestedEj at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice7PrivateC1EP11wl_resourcePNS0_18FakeInputInterfaceEPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice7PrivateC2EP11wl_resourcePNS0_18FakeInputInterfaceEPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDevice8resourceEv at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDeviceC1EP11wl_resourcePNS0_18FakeInputInterfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDeviceC2EP11wl_resourcePNS0_18FakeInputInterfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDeviceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDeviceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15FakeInputDeviceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15OutputChangeSet11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSet11qt_metacastEPKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSet16staticMetaObjectE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSet7PrivateC1EPNS0_21OutputDeviceInterfaceEPS1_ at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSet7PrivateC2EPNS0_21OutputDeviceInterfaceEPS1_ at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSet7PrivateD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSet7PrivateD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSetC1EPNS0_21OutputDeviceInterfaceEP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSetC2EPNS0_21OutputDeviceInterfaceEP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSetD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSetD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server15OutputChangeSetD2Ev at Base 4:5.4.2+git20151109.2356+15.10
++=======
+  _ZN8KWayland6Server15FakeInputDevice11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice17setAuthenticationEb at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice20pointerAxisRequestedEN2Qt11OrientationEd at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice22pointerMotionRequestedERK6QSizeF at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice23authenticationRequestedERK7QStringS4_ at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice27pointerButtonPressRequestedEj at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice29pointerButtonReleaseRequestedEj at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice7PrivateC1EP11wl_resourcePNS0_18FakeInputInterfaceEPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice7PrivateC2EP11wl_resourcePNS0_18FakeInputInterfaceEPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDevice8resourceEv at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDeviceC1EP11wl_resourcePNS0_18FakeInputInterfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDeviceC2EP11wl_resourcePNS0_18FakeInputInterfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDeviceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDeviceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15FakeInputDeviceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server15OutputInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server15OutputInterface11setDpmsModeENS1_8DpmsModeE at Base 4:5.4.1+git20150917.0854
   _ZN8KWayland6Server15OutputInterface11setSubPixelENS1_8SubPixelE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface12modelChangedERK7QString at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface12modesChangedEv at Base 4:5.1.1+git20141128.0009
@@@ -249,9 -183,6 +288,12 @@@
   _ZN8KWayland6Server15OutputInterface7Private9sendScaleERKNS2_12ResourceDataE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server15OutputInterface7PrivateD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server15OutputInterface7PrivateD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server15OutputInterface7PrivateD2Ev at Base 4:5.4.1+git20150917.0854
++=======
++>>>>>>> master
   _ZN8KWayland6Server15OutputInterface7addModeERK5QSize6QFlagsINS1_8ModeFlagEEi at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface8setModelERK7QString at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15OutputInterface8setScaleEi at Base 4:5.1.1+git20141128.0009
@@@ -281,35 -212,35 +323,67 @@@
   _ZN8KWayland6Server15RegionInterfaceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15RegionInterfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server15RegionInterfaceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server15ShadowInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private14commitCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private17attachTopCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private17offsetTopCallbackEP9wl_clientP11wl_resourcei at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private18attachLeftCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private18offsetLeftCallbackEP9wl_clientP11wl_resourcei at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private19attachRightCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private19offsetRightCallbackEP9wl_clientP11wl_resourcei at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private20attachBottomCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private20offsetBottomCallbackEP9wl_clientP11wl_resourcei at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private21attachTopLeftCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private22attachTopRightCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private24attachBottomLeftCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private25attachBottomRightCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private6attachENS2_5State5FlagsEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7Private6commitEv at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7PrivateC1EPS1_PNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7PrivateC2EPS1_PNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7PrivateD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7PrivateD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterface7PrivateD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterfaceC1EPNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterfaceC2EPNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server15ShadowInterfaceD2Ev at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server15ShadowInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private14commitCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private17attachTopCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private17offsetTopCallbackEP9wl_clientP11wl_resourcei at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private18attachLeftCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private18offsetLeftCallbackEP9wl_clientP11wl_resourcei at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private19attachRightCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private19offsetRightCallbackEP9wl_clientP11wl_resourcei at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private20attachBottomCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private20offsetBottomCallbackEP9wl_clientP11wl_resourcei at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private21attachTopLeftCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private22attachTopRightCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private24attachBottomLeftCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private25attachBottomRightCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private6attachENS2_5State5FlagsEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7Private6commitEv at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7PrivateC1EPS1_PNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7PrivateC2EPS1_PNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7PrivateD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7PrivateD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterface7PrivateD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterfaceC1EPNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterfaceC2EPNS0_22ShadowManagerInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server15ShadowInterfaceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server16ClientConnection11getResourceEj at Base 4:5.2.2+git20150407.0736
   _ZN8KWayland6Server16ClientConnection11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16ClientConnection11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
@@@ -359,11 -288,9 +433,15 @@@
   _ZN8KWayland6Server16SurfaceInterface12scaleChangedEi at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface13frameRenderedEj at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface13opaqueChangedERK7QRegion at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server16SurfaceInterface13shadowChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Server16SurfaceInterface15contrastChangedEv at Base 4:5.4.1+git20150917.0854
++=======
+  _ZN8KWayland6Server16SurfaceInterface13shadowChangedEv at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server16SurfaceInterface16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface16transformChangedENS0_15OutputInterface9TransformE at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server16SurfaceInterface22slideOnShowHideChangedEv at Base 4:5.4.1+git20150917.0854
   _ZN8KWayland6Server16SurfaceInterface3getEP11wl_resource at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface3getEjPKNS0_16ClientConnectionE at Base 4:5.2.2+git20150407.0736
   _ZN8KWayland6Server16SurfaceInterface6bufferEv at Base 4:5.1.1+git20141128.0009
@@@ -392,9 -317,8 +470,13 @@@
   _ZN8KWayland6Server16SurfaceInterface7Private8addChildE8QPointerINS0_19SubSurfaceInterfaceEE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface7Private8setInputERK7QRegionb at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface7Private8setScaleEi at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server16SurfaceInterface7Private8setSlideERK8QPointerINS0_14SlideInterfaceEE at Base 4:5.4.1+git20150917.0854
   _ZN8KWayland6Server16SurfaceInterface7Private9setOpaqueERK7QRegion at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server16SurfaceInterface7Private9setShadowERK8QPointerINS0_15ShadowInterfaceEE at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server16SurfaceInterface7Private9setShadowERK8QPointerINS0_15ShadowInterfaceEE at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server16SurfaceInterface7PrivateC1EPS1_PNS0_19CompositorInterfaceEP11wl_resource at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface7PrivateC2EPS1_PNS0_19CompositorInterfaceEP11wl_resource at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server16SurfaceInterface7PrivateD0Ev at Base 4:5.1.1+git20141128.0009
@@@ -469,26 -371,25 +551,48 @@@
   _ZN8KWayland6Server18DataOfferInterfaceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server18DataOfferInterfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server18DataOfferInterfaceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server18FakeInputInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface13deviceCreatedEPNS0_15FakeInputDeviceE at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private12axisCallbackEP9wl_clientP11wl_resourceji at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private14buttonCallbackEP9wl_clientP11wl_resourcejj at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private20authenticateCallbackEP9wl_clientP11wl_resourcePKcS8_ at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private21pointerMotionCallbackEP9wl_clientP11wl_resourceii at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private4bindEP9wl_clientjj at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private6deviceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private6unbindEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server18FakeInputInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server18FakeInputInterfaceD2Ev at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server18FakeInputInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface13deviceCreatedEPNS0_15FakeInputDeviceE at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private12axisCallbackEP9wl_clientP11wl_resourceji at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private14buttonCallbackEP9wl_clientP11wl_resourcejj at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private20authenticateCallbackEP9wl_clientP11wl_resourcePKcS8_ at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private21pointerMotionCallbackEP9wl_clientP11wl_resourceii at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private4bindEP9wl_clientjj at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private6deviceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7Private6unbindEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server18FakeInputInterfaceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server19CompositorInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server19CompositorInterface11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server19CompositorInterface13regionCreatedEPNS0_15RegionInterfaceE at Base 4:5.1.1+git20141128.0009
@@@ -586,185 -485,93 +690,275 @@@
   _ZN8KWayland6Server19SubSurfaceInterfaceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server19SubSurfaceInterfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server19SubSurfaceInterfaceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server20BlurManagerInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private10createBlurEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private11s_interfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private13unsetCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private14createCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private4bindEP9wl_clientjj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private6unbindEP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterfaceD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterfaceD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20BlurManagerInterfaceD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface7Private11s_interfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface7Private15getDpmsCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface7Private4bindEP9wl_clientjj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterfaceD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterfaceD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20DpmsManagerInterfaceD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20IdleTimeoutInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7Private15releaseCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7Private28simulateUserActivityCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7Private5setupEj at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7PrivateC1EPNS0_13SeatInterfaceEPS1_PNS0_13IdleInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7PrivateC2EPNS0_13SeatInterfaceEPS1_PNS0_13IdleInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7PrivateD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7PrivateD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterface7PrivateD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterfaceC1EPNS0_13SeatInterfaceEPNS0_13IdleInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterfaceC2EPNS0_13SeatInterfaceEPNS0_13IdleInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20IdleTimeoutInterfaceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface14surfaceCreatedEPNS0_27PlasmaShellSurfaceInterfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface7Private13createSurfaceEP9wl_clientjjPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface7Private21createSurfaceCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface7Private4bindEP9wl_clientjj at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server20PlasmaShellInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server20PlasmaShellInterfaceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server21OutputDeviceInterface10setEnabledENS1_10EnablementE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface11edidChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface11qt_metacastEPKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface11setSubPixelENS1_8SubPixelE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface11uuidChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface12modelChangedERK7QString at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface12modesChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface12scaleChangedEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface12setTransformENS1_9TransformE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface14enabledChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface14setCurrentModeEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface15setManufacturerERK7QString at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface15setPhysicalSizeERK5QSize at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface15subPixelChangedENS1_8SubPixelE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface16pixelSizeChangedERK5QSize at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface16staticMetaObjectE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface16transformChangedENS1_9TransformE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface17setGlobalPositionERK6QPoint at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface18currentModeChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface18refreshRateChangedEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface19manufacturerChangedERK7QString at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface19physicalSizeChangedERK5QSize at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface21globalPositionChangedERK6QPoint at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface3getEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private10s_privatesE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private11sendEnabledEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private11updateScaleEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private12sendGeometryEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private14updateGeometryEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private3getEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private4bindEP9wl_clientjj at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private4castEP11wl_resource at Base 4:5.4.3+git20151202.0927+16.04
 + _ZN8KWayland6Server21OutputDeviceInterface7Private6unbindEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private8sendDoneERKNS2_12ResourceDataE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private8sendEdidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private8sendModeEP11wl_resourceRKNS1_4ModeE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private8sendUuidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private9s_versionE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7Private9sendScaleERKNS2_12ResourceDataE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7PrivateD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7PrivateD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7PrivateD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7addModeERNS1_4ModeE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7setEdidERK10QByteArray at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface7setUuidERK10QByteArray at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface8setModelERK7QString at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterface8setScaleEi at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterfaceD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterfaceD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21OutputDeviceInterfaceD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21PlasmaWindowInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface12setCloseableEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface12setKeepAboveEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface12setKeepBelowEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface12setMaximizedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface12setMinimizedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface13setFullscreenEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface14closeRequestedEv at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface14setSkipTaskbarEb at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Server21PlasmaWindowInterface15activeRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface15setMaximizeableEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface15setMinimizeableEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface16setOnAllDesktopsEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface17setFullscreenableEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface17setThemedIconNameERK7QString at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface17setVirtualDesktopEj at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface18closeableRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface18keepAboveRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface18keepBelowRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface18maximizedRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface18minimizedRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface19fullscreenRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface19setDemandsAttentionEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface20skipTaskbarRequestedEb at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Server21PlasmaWindowInterface21maximizeableRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface21minimizeableRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface23fullscreenableRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface23virtualDesktopRequestedEj at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface25demandsAttentionRequestedEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface26minimizedGeometriesChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21PlasmaWindowInterface5unmapEv at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private13closeCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private14createResourceEP11wl_resourcej at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private16setStateCallbackEP9wl_clientP11wl_resourcejj at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private17setThemedIconNameERK7QString at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private17setVirtualDesktopEj at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private23destroyListenerCallbackEP11wl_listenerPv at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private25setVirtualDesktopCallbackEP9wl_clientP11wl_resourcej at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private28setMinimizedGeometryCallbackEP9wl_clientP11wl_resourceS6_jjjj at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private30unsetMinimizedGeometryCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private5unmapEv at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private6unbindEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private8setAppIdERK7QString at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private8setStateE38org_kde_plasma_window_management_stateb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7Private8setTitleERK7QString at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7PrivateC1EPNS0_31PlasmaWindowManagementInterfaceEPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7PrivateC2EPNS0_31PlasmaWindowManagementInterfaceEPS1_ at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7PrivateD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface7PrivateD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface8setAppIdERK7QString at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface8setTitleERK7QString at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterface9setActiveEb at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterfaceC1EPNS0_31PlasmaWindowManagementInterfaceEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterfaceC2EPNS0_31PlasmaWindowManagementInterfaceEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server21PlasmaWindowInterfaceD2Ev at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server20IdleTimeoutInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7Private15releaseCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7Private28simulateUserActivityCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7Private5setupEj at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7PrivateC1EPNS0_13SeatInterfaceEPS1_PNS0_13IdleInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7PrivateC2EPNS0_13SeatInterfaceEPS1_PNS0_13IdleInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7PrivateD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7PrivateD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterface7PrivateD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterfaceC1EPNS0_13SeatInterfaceEPNS0_13IdleInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterfaceC2EPNS0_13SeatInterfaceEPNS0_13IdleInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20IdleTimeoutInterfaceD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface14surfaceCreatedEPNS0_27PlasmaShellSurfaceInterfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface7Private13createSurfaceEP9wl_clientjjPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface7Private21createSurfaceCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface7Private4bindEP9wl_clientjj at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server20PlasmaShellInterfaceD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface12setCloseableEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface12setKeepAboveEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface12setKeepBelowEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface12setMaximizedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface12setMinimizedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface13setFullscreenEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface14closeRequestedEv at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface15activeRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface15setMaximizeableEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface15setMinimizeableEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface16setOnAllDesktopsEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface17setFullscreenableEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface17setThemedIconNameERK7QString at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface17setVirtualDesktopEj at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface18closeableRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface18keepAboveRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface18keepBelowRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface18maximizedRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface18minimizedRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface19fullscreenRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface19setDemandsAttentionEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface21maximizeableRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface21minimizeableRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface23fullscreenableRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface23virtualDesktopRequestedEj at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface25demandsAttentionRequestedEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface5unmapEv at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private13closeCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private14createResourceEP11wl_resourcej at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private16setStateCallbackEP9wl_clientP11wl_resourcejj at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private17setThemedIconNameERK7QString at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private17setVirtualDesktopEj at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private23destroyListenerCallbackEP11wl_listenerPv at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private25setVirtualDesktopCallbackEP9wl_clientP11wl_resourcej at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private5unmapEv at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private6unbindEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private8setAppIdERK7QString at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private8setStateE38org_kde_plasma_window_management_stateb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7Private8setTitleERK7QString at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7PrivateC1EPNS0_31PlasmaWindowManagementInterfaceEPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7PrivateC2EPNS0_31PlasmaWindowManagementInterfaceEPS1_ at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7PrivateD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface7PrivateD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface8setAppIdERK7QString at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface8setTitleERK7QString at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterface9setActiveEb at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterfaceC1EPNS0_31PlasmaWindowManagementInterfaceEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterfaceC2EPNS0_31PlasmaWindowManagementInterfaceEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server21PlasmaWindowInterfaceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server21ShellSurfaceInterface11pingTimeoutEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server21ShellSurfaceInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server21ShellSurfaceInterface11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
@@@ -809,40 -608,22 +1003,59 @@@
   _ZN8KWayland6Server21ShellSurfaceInterfaceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server21ShellSurfaceInterfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server21ShellSurfaceInterfaceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server21SlideManagerInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface11qt_metacastEPKc at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface16staticMetaObjectE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private11createSlideEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private11s_interfaceE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private13unsetCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private14createCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private4bindEP9wl_clientjj at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private6unbindEP11wl_resource at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterfaceD0Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterfaceD1Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server21SlideManagerInterfaceD2Ev at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server22ShadowManagerInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private12createShadowEP9wl_clientP11wl_resourcejS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private13unsetCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private14createCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private4bindEP9wl_clientjj at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private6unbindEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server22ShadowManagerInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server22ShadowManagerInterfaceD2Ev at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server22ShadowManagerInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7Private12createShadowEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7Private13unsetCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7Private14createCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7Private4bindEP9wl_clientjj at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7Private6unbindEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server22ShadowManagerInterfaceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server22SubCompositorInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server22SubCompositorInterface11qt_metacastEPKc at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server22SubCompositorInterface16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
@@@ -917,113 -660,80 +1130,190 @@@
   _ZN8KWayland6Server26DataDeviceManagerInterfaceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server26DataDeviceManagerInterfaceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server26DataDeviceManagerInterfaceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface14lowerRequestedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface14raiseRequestedEv at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface5closeEv at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private13lowerCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private13raiseCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private22setWindowFlagsCallbackEP9wl_clientP11wl_resourcei at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private29updateGenericPropertyCallbackEP9wl_clientP11wl_resourcePKcP8wl_array at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private33setContentOrientationMaskCallbackEP9wl_clientP11wl_resourcei at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7PrivateC1EPS1_PNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterface7PrivateC2EPS1_PNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterfaceC1EPNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterfaceC2EPNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server26QtExtendedSurfaceInterfaceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface11roleChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface15positionChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface18skipTaskbarChangedEv at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface20panelBehaviorChangedEv at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface3getEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private11setPositionERK6QPoint at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private15destroyCallbackEP9wl_clientP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private15setRoleCallbackEP9wl_clientP11wl_resourcej at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private16setPanelBehaviorE37org_kde_plasma_surface_panel_behavior at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private17setOutputCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private19setPositionCallbackEP9wl_clientP11wl_resourceii at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private22setSkipTaskbarCallbackEP9wl_clientP11wl_resourcej at Base 4:5.4.1+git20151001.0029+15.10
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private24setPanelBehaviorCallbackEP9wl_clientP11wl_resourcej at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private7setRoleEj at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateC1EPS1_PNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateC2EPS1_PNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceC1EPNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceC2EPNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface14surfaceCreatedEPNS0_26QtExtendedSurfaceInterfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private13createSurfaceEP9wl_clientjjPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private21createSurfaceCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private4bindEP9wl_clientjj at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server27QtSurfaceExtensionInterfaceD2Ev at Base 4:5.3.95
 + _ZN8KWayland6Server28OutputConfigurationInterface10setAppliedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface11qt_metacastEPKc at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface16staticMetaObjectE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private10sendFailedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private11s_interfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private11sendAppliedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private12modeCallbackEP9wl_clientP11wl_resourceS6_i at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private13applyCallbackEP9wl_clientP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private13scaleCallbackEP9wl_clientP11wl_resourceS6_i at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private14enableCallbackEP9wl_clientP11wl_resourceS6_i at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private14pendingChangesEPNS0_21OutputDeviceInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private16positionCallbackEP9wl_clientP11wl_resourceS6_ii at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private17transformCallbackEP9wl_clientP11wl_resourceS6_i at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7Private19clearPendingChangesEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7PrivateC1EPS1_PNS0_25OutputManagementInterfaceEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7PrivateC2EPS1_PNS0_25OutputManagementInterfaceEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7PrivateD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7PrivateD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface7PrivateD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterface9setFailedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterfaceC1EPNS0_25OutputManagementInterfaceEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterfaceC2EPNS0_25OutputManagementInterfaceEP11wl_resource at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterfaceD0Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterfaceD1Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server28OutputConfigurationInterfaceD2Ev at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface11qt_metacastEPKc at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface12createWindowEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface16staticMetaObjectE at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface22setShowingDesktopStateENS1_19ShowingDesktopStateE at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface27requestChangeShowingDesktopENS1_19ShowingDesktopStateE at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private11s_interfaceE at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private17getWindowCallbackEP9wl_clientP11wl_resourcejj at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private19showDesktopCallbackEP9wl_clientP11wl_resourcej at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private23sendShowingDesktopStateEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private23sendShowingDesktopStateEv at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private4bindEP9wl_clientjj at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private6unbindEP11wl_resource at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private9s_versionE at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterfaceD0Ev at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterfaceD1Ev at Base 4:5.3.95
 + _ZN8KWayland6Server31PlasmaWindowManagementInterfaceD2Ev at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface5closeEv at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private13lowerCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private13raiseCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private22setWindowFlagsCallbackEP9wl_clientP11wl_resourcei at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private29updateGenericPropertyCallbackEP9wl_clientP11wl_resourcePKcP8wl_array at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7Private33setContentOrientationMaskCallbackEP9wl_clientP11wl_resourcei at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7PrivateC1EPS1_PNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterface7PrivateC2EPS1_PNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterfaceC1EPNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterfaceC2EPNS0_27QtSurfaceExtensionInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server26QtExtendedSurfaceInterfaceD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface11roleChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface15positionChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface20panelBehaviorChangedEv at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private11setPositionERK6QPoint at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private15destroyCallbackEP9wl_clientP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private15setRoleCallbackEP9wl_clientP11wl_resourcej at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private16setPanelBehaviorE37org_kde_plasma_surface_panel_behavior at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private17setOutputCallbackEP9wl_clientP11wl_resourceS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private19setPositionCallbackEP9wl_clientP11wl_resourceii at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private24setPanelBehaviorCallbackEP9wl_clientP11wl_resourcej at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7Private7setRoleEj at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateC1EPS1_PNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateC2EPS1_PNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceC1EPNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceC2EPNS0_20PlasmaShellInterfaceEPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server27PlasmaShellSurfaceInterfaceD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface14surfaceCreatedEPNS0_26QtExtendedSurfaceInterfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private13createSurfaceEP9wl_clientjjPNS0_16SurfaceInterfaceEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private21createSurfaceCallbackEP9wl_clientP11wl_resourcejS6_ at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface7Private4bindEP9wl_clientjj at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server27QtSurfaceExtensionInterfaceD2Ev at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface11qt_metacastEPKc at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface12createWindowEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface16staticMetaObjectE at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface22setShowingDesktopStateENS1_19ShowingDesktopStateE at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface27requestChangeShowingDesktopENS1_19ShowingDesktopStateE at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private11s_interfaceE at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private17getWindowCallbackEP9wl_clientP11wl_resourcejj at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private19showDesktopCallbackEP9wl_clientP11wl_resourcej at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private23sendShowingDesktopStateEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private23sendShowingDesktopStateEv at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private4bindEP9wl_clientjj at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7Private6unbindEP11wl_resource at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7PrivateC1EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterface7PrivateC2EPS1_PNS0_7DisplayE at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterfaceC1EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterfaceC2EPNS0_7DisplayEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterfaceD0Ev at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterfaceD1Ev at Base 4:5.4.0
+  _ZN8KWayland6Server31PlasmaWindowManagementInterfaceD2Ev at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server6Cursor11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:5.2.1+git20150228.0043+15.04
   _ZN8KWayland6Server6Cursor11qt_metacastEPKc at Base 4:5.2.1+git20150228.0043+15.04
   _ZN8KWayland6Server6Cursor14hotspotChangedEv at Base 4:5.2.1+git20150228.0043+15.04
@@@ -1058,7 -768,7 +1348,11 @@@
   _ZN8KWayland6Server6GlobalD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server6GlobalD2Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server6GlobalcvP9wl_globalEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server7Display10createIdleEP7QObject at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server7Display10createIdleEP7QObject at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server7Display10createSeatEP7QObject at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server7Display10nextSerialEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server7Display11createShellEP7QObject at Base 4:5.1.1+git20141128.0009
@@@ -1073,25 -783,18 +1367,41 @@@
   _ZN8KWayland6Server7Display14dispatchEventsEi at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server7Display14runningChangedEb at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server7Display15clientConnectedEPNS0_16ClientConnectionE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server7Display15createFakeInputEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server7Display16aboutToTerminateEv at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server7Display16createCompositorEP7QObject at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server7Display16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server7Display17createBlurManagerEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server7Display17createDpmsManagerEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server7Display17createPlasmaShellEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server7Display17socketNameChangedERK7QString at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server7Display18clientDisconnectedEPNS0_16ClientConnectionE at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server7Display18createOutputDeviceEP7QObject at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server7Display18createSlideManagerEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server7Display18removeOutputDeviceEPNS0_21OutputDeviceInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZN8KWayland6Server7Display19createShadowManagerEP7QObject at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server7Display15createFakeInputEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server7Display16aboutToTerminateEv at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Server7Display16createCompositorEP7QObject at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Server7Display16staticMetaObjectE at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Server7Display17createPlasmaShellEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server7Display17socketNameChangedERK7QString at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Server7Display18clientDisconnectedEPNS0_16ClientConnectionE at Base 4:5.1.1+git20141128.0009
+  _ZN8KWayland6Server7Display19createShadowManagerEP7QObject at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server7Display19createSubCompositorEP7QObject at Base 4:5.1.1+git20141128.0009
 + _ZN8KWayland6Server7Display21createContrastManagerEP7QObject at Base 4:5.4.1+git20150917.0854
 + _ZN8KWayland6Server7Display22createOutputManagementEP7QObject at Base 4:5.4.2+git20151109.2356+15.10
   _ZN8KWayland6Server7Display23createDataDeviceManagerEP7QObject at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZN8KWayland6Server7Display24createQtSurfaceExtensionEP7QObject at Base 4:5.3.95
 + _ZN8KWayland6Server7Display28createPlasmaWindowManagementEP7QObject at Base 4:5.3.95
++=======
+  _ZN8KWayland6Server7Display24createQtSurfaceExtensionEP7QObject at Base 4:5.4.0
+  _ZN8KWayland6Server7Display28createPlasmaWindowManagementEP7QObject at Base 4:5.4.0
++>>>>>>> master
   _ZN8KWayland6Server7Display5startENS1_9StartModeE at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server7Display6serialEv at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server7Display7Private10setRunningEb at Base 4:5.1.1+git20141128.0009
@@@ -1129,9 -832,7 +1439,13 @@@
   _ZN8KWayland6Server8ResourceD0Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server8ResourceD1Ev at Base 4:5.1.1+git20141128.0009
   _ZN8KWayland6Server8ResourceD2Ev at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server13BlurInterface10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server13BlurInterface6d_funcEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server13IdleInterface10metaObjectEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Server13IdleInterface10metaObjectEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server13SeatInterface10hasPointerEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server13SeatInterface10keymapSizeEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server13SeatInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
@@@ -1177,25 -872,13 +1491,34 @@@
   _ZNK8KWayland6Server14TouchInterface6d_funcEv at Base 4:5.2.2+git20150326.0109+15.04
   _ZNK8KWayland6Server15BufferInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15BufferInterface12isReferencedEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server15BufferInterface15hasAlphaChannelEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Server15BufferInterface15hasAlphaChannelEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server15BufferInterface4sizeEv at Base 4:5.2.1+git20150303.0028+15.04
   _ZNK8KWayland6Server15BufferInterface7Private6formatEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15BufferInterface7surfaceEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15BufferInterface8resourceEv at Base 4:5.2.1+git20150225.0737+15.04
++<<<<<<< HEAD
 + _ZNK8KWayland6Server15FakeInputDevice10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15FakeInputDevice15isAuthenticatedEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15OutputChangeSet10metaObjectEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet11modeChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet12scaleChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet14enabledChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet15positionChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet16transformChangedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet4modeEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet5scaleEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet6d_funcEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet7enabledEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet8positionEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server15OutputChangeSet9transformEv at Base 4:5.4.2+git20151109.2356+15.10
++=======
+  _ZNK8KWayland6Server15FakeInputDevice10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15FakeInputDevice15isAuthenticatedEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server15OutputInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15OutputInterface11refreshRateEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15OutputInterface12manufacturerEv at Base 4:5.1.1+git20141128.0009
@@@ -1215,17 -896,17 +1538,31 @@@
   _ZNK8KWayland6Server15RegionInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15RegionInterface6d_funcEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server15RegionInterface6regionEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server15ShadowInterface10bottomLeftEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface11bottomRightEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface3topEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface4leftEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface5rightEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface6bottomEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface6d_funcEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface6offsetEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface7topLeftEv at Base 4:5.3.95
 + _ZNK8KWayland6Server15ShadowInterface8topRightEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Server15ShadowInterface10bottomLeftEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface11bottomRightEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface3topEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface4leftEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface5rightEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface6bottomEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface6d_funcEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface6offsetEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface7topLeftEv at Base 4:5.4.0
+  _ZNK8KWayland6Server15ShadowInterface8topRightEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server16ClientConnection10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server16ClientConnection6userIdEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server16ClientConnection7groupIdEv at Base 4:5.1.1+git20141128.0009
@@@ -1248,21 -926,14 +1585,29 @@@
   _ZNK8KWayland6Server16SurfaceInterface6damageEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server16SurfaceInterface6offsetEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server16SurfaceInterface6opaqueEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server16SurfaceInterface6shadowEv at Base 4:5.3.95
 + _ZNK8KWayland6Server16SurfaceInterface8contrastEv at Base 4:5.4.1+git20150917.0854
++=======
+  _ZNK8KWayland6Server16SurfaceInterface6shadowEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server16SurfaceInterface9transformEv at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Server17ContrastInterface10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server17ContrastInterface10saturationEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server17ContrastInterface6d_funcEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server17ContrastInterface6regionEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server17ContrastInterface8contrastEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server17ContrastInterface9intensityEv at Base 4:5.4.1+git20150917.0854
   _ZNK8KWayland6Server17KeyboardInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server17KeyboardInterface14focusedSurfaceEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server17KeyboardInterface6d_funcEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server18DataOfferInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server18DataOfferInterface6d_funcEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server18FakeInputInterface10metaObjectEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Server18FakeInputInterface10metaObjectEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server19CompositorInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server19DataDeviceInterface10dragSourceEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server19DataDeviceInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
@@@ -1278,31 -949,10 +1623,38 @@@
   _ZNK8KWayland6Server19SubSurfaceInterface4modeEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server19SubSurfaceInterface6d_funcEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server19SubSurfaceInterface8positionEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server20BlurManagerInterface10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server20DpmsManagerInterface10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server20IdleTimeoutInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server20IdleTimeoutInterface6d_funcEv at Base 4:5.3.95
 + _ZNK8KWayland6Server20PlasmaShellInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server21OutputDeviceInterface10metaObjectEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface11refreshRateEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface12manufacturerEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface12physicalSizeEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface13currentModeIdEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface14globalPositionEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface4edidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface4uuidEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface5modelEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface5modesEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface5scaleEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface6d_funcEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface7Private10toSubPixelEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface7Private11toTransformEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface7enabledEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface8subPixelEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface9pixelSizeEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21OutputDeviceInterface9transformEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server21PlasmaWindowInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server21PlasmaWindowInterface19minimizedGeometriesEv at Base 4:5.4.2+git20151109.2356+15.10
++=======
+  _ZNK8KWayland6Server20IdleTimeoutInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server20IdleTimeoutInterface6d_funcEv at Base 4:5.4.0
+  _ZNK8KWayland6Server20PlasmaShellInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server21PlasmaWindowInterface10metaObjectEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server21ShellSurfaceInterface10isToplevelEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server21ShellSurfaceInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server21ShellSurfaceInterface11isMaximizedEv at Base 4:5.1.1+git20141216.0026+15.04
@@@ -1315,36 -961,26 +1667,58 @@@
   _ZNK8KWayland6Server21ShellSurfaceInterface5shellEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server21ShellSurfaceInterface5titleEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server21ShellSurfaceInterface6d_funcEv at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Server21ShellSurfaceInterface7isPopupEv at Base 4:5.4.1+git20150917.0854
   _ZNK8KWayland6Server21ShellSurfaceInterface7surfaceEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server21ShellSurfaceInterface8isPingedEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server21SlideManagerInterface10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server22ShadowManagerInterface10metaObjectEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Server22ShadowManagerInterface10metaObjectEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server22SubCompositorInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
 + _ZNK8KWayland6Server24ContrastManagerInterface10metaObjectEv at Base 4:5.4.1+git20150917.0854
 + _ZNK8KWayland6Server25OutputManagementInterface10metaObjectEv at Base 4:5.4.2+git20151109.2356+15.10
   _ZNK8KWayland6Server26DataDeviceManagerInterface10metaObjectEv at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZNK8KWayland6Server26QtExtendedSurfaceInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server26QtExtendedSurfaceInterface5shellEv at Base 4:5.3.95
 + _ZNK8KWayland6Server26QtExtendedSurfaceInterface6d_funcEv at Base 4:5.3.95
 + _ZNK8KWayland6Server26QtExtendedSurfaceInterface7surfaceEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface11skipTaskbarEv at Base 4:5.4.1+git20151001.0029+15.10
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface13isPositionSetEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface13panelBehaviorEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface4roleEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface5shellEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface6d_funcEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface7surfaceEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27PlasmaShellSurfaceInterface8positionEv at Base 4:5.3.95
 + _ZNK8KWayland6Server27QtSurfaceExtensionInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server28OutputConfigurationInterface10metaObjectEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server28OutputConfigurationInterface6d_funcEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server28OutputConfigurationInterface7Private17hasPendingChangesEPNS0_21OutputDeviceInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server28OutputConfigurationInterface7Private32emitConfigurationChangeRequestedEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server28OutputConfigurationInterface7changesEv at Base 4:5.4.2+git20151109.2356+15.10
 + _ZNK8KWayland6Server31PlasmaWindowManagementInterface10metaObjectEv at Base 4:5.3.95
 + _ZNK8KWayland6Server31PlasmaWindowManagementInterface6d_funcEv at Base 4:5.3.95
++=======
+  _ZNK8KWayland6Server26QtExtendedSurfaceInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server26QtExtendedSurfaceInterface5shellEv at Base 4:5.4.0
+  _ZNK8KWayland6Server26QtExtendedSurfaceInterface6d_funcEv at Base 4:5.4.0
+  _ZNK8KWayland6Server26QtExtendedSurfaceInterface7surfaceEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface13isPositionSetEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface13panelBehaviorEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface4roleEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface5shellEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface6d_funcEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface7surfaceEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27PlasmaShellSurfaceInterface8positionEv at Base 4:5.4.0
+  _ZNK8KWayland6Server27QtSurfaceExtensionInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server31PlasmaWindowManagementInterface10metaObjectEv at Base 4:5.4.0
+  _ZNK8KWayland6Server31PlasmaWindowManagementInterface6d_funcEv at Base 4:5.4.0
++>>>>>>> master
   _ZNK8KWayland6Server6Cursor10metaObjectEv at Base 4:5.2.1+git20150228.0043+15.04
   _ZNK8KWayland6Server6Cursor13enteredSerialEv at Base 4:5.2.1+git20150228.0043+15.04
   _ZNK8KWayland6Server6Cursor7hotspotEv at Base 4:5.2.1+git20150228.0043+15.04
@@@ -1364,10 -999,8 +1738,15 @@@
   _ZNK8KWayland6Server8Resource10metaObjectEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server8Resource14parentResourceEv at Base 4:5.1.1+git20141128.0009
   _ZNK8KWayland6Server8Resource2idEv at Base 4:5.2.0+git20150210.2224+15.04
++<<<<<<< HEAD
 + _ZTIN8KWayland6Server13BlurInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server13BlurInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server13IdleInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server13IdleInterfaceE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Server13IdleInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server13IdleInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Server13SeatInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server13SeatInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server14ShellInterface7PrivateE at Base 4:5.1.1+git20141128.0009
@@@ -1377,14 -1008,13 +1756,23 @@@
   _ZTIN8KWayland6Server14TouchInterface7PrivateE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTIN8KWayland6Server14TouchInterfaceE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTIN8KWayland6Server15BufferInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Server15FakeInputDeviceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server15OutputChangeSetE at Base 4:5.4.2+git20151109.2356+15.10
++=======
+  _ZTIN8KWayland6Server15FakeInputDeviceE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Server15OutputInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server15OutputInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server15RegionInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server15RegionInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Server15ShadowInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server15ShadowInterfaceE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Server15ShadowInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server15ShadowInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Server16ClientConnectionE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server16PointerInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server16PointerInterfaceE at Base 4:5.1.1+git20141128.0009
@@@ -1396,8 -1024,8 +1784,13 @@@
   _ZTIN8KWayland6Server17KeyboardInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server18DataOfferInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server18DataOfferInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Server18FakeInputInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server18FakeInputInterfaceE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Server18FakeInputInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server18FakeInputInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Server19CompositorInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server19CompositorInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server19DataDeviceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
@@@ -1406,51 -1034,35 +1799,79 @@@
   _ZTIN8KWayland6Server19DataSourceInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server19SubSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server19SubSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Server20BlurManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server20BlurManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server20DpmsManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server20DpmsManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server20IdleTimeoutInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server20IdleTimeoutInterfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server20PlasmaShellInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server20PlasmaShellInterfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server21OutputDeviceInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Server21OutputDeviceInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Server21PlasmaWindowInterfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server21ShellSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Server21ShellSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Server21SlideManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server21SlideManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server22ShadowManagerInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server22ShadowManagerInterfaceE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Server20IdleTimeoutInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server20IdleTimeoutInterfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Server20PlasmaShellInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server20PlasmaShellInterfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Server21PlasmaWindowInterfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Server21ShellSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
+  _ZTIN8KWayland6Server21ShellSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
+  _ZTIN8KWayland6Server22ShadowManagerInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server22ShadowManagerInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Server22SubCompositorInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server22SubCompositorInterfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTIN8KWayland6Server24ContrastManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server24ContrastManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTIN8KWayland6Server25OutputManagementInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Server25OutputManagementInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
   _ZTIN8KWayland6Server26DataDeviceManagerInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server26DataDeviceManagerInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTIN8KWayland6Server26QtExtendedSurfaceInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server26QtExtendedSurfaceInterfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server27PlasmaShellSurfaceInterfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server27QtSurfaceExtensionInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server27QtSurfaceExtensionInterfaceE at Base 4:5.3.95
 + _ZTIN8KWayland6Server28OutputConfigurationInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Server28OutputConfigurationInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTIN8KWayland6Server31PlasmaWindowManagementInterface7PrivateE at Base 4:5.3.95
 + _ZTIN8KWayland6Server31PlasmaWindowManagementInterfaceE at Base 4:5.3.95
++=======
+  _ZTIN8KWayland6Server26QtExtendedSurfaceInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server26QtExtendedSurfaceInterfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server27PlasmaShellSurfaceInterfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Server27QtSurfaceExtensionInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server27QtSurfaceExtensionInterfaceE at Base 4:5.4.0
+  _ZTIN8KWayland6Server31PlasmaWindowManagementInterface7PrivateE at Base 4:5.4.0
+  _ZTIN8KWayland6Server31PlasmaWindowManagementInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTIN8KWayland6Server6CursorE at Base 4:5.2.1+git20150228.0043+15.04
   _ZTIN8KWayland6Server6Global7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server6GlobalE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server7DisplayE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server8Resource7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTIN8KWayland6Server8ResourceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Server13BlurInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server13BlurInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server13IdleInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server13IdleInterfaceE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Server13IdleInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server13IdleInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Server13SeatInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server13SeatInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server14ShellInterface7PrivateE at Base 4:5.1.1+git20141128.0009
@@@ -1460,14 -1070,13 +1881,23 @@@
   _ZTSN8KWayland6Server14TouchInterface7PrivateE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTSN8KWayland6Server14TouchInterfaceE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTSN8KWayland6Server15BufferInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Server15FakeInputDeviceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server15OutputChangeSetE at Base 4:5.4.2+git20151109.2356+15.10
++=======
+  _ZTSN8KWayland6Server15FakeInputDeviceE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Server15OutputInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server15OutputInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server15RegionInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server15RegionInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Server15ShadowInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server15ShadowInterfaceE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Server15ShadowInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server15ShadowInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Server16ClientConnectionE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server16PointerInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server16PointerInterfaceE at Base 4:5.1.1+git20141128.0009
@@@ -1479,8 -1086,8 +1909,13 @@@
   _ZTSN8KWayland6Server17KeyboardInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server18DataOfferInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server18DataOfferInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Server18FakeInputInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server18FakeInputInterfaceE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Server18FakeInputInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server18FakeInputInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Server19CompositorInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server19CompositorInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server19DataDeviceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
@@@ -1489,51 -1096,35 +1924,79 @@@
   _ZTSN8KWayland6Server19DataSourceInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server19SubSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server19SubSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Server20BlurManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server20BlurManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server20DpmsManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server20DpmsManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server20IdleTimeoutInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server20IdleTimeoutInterfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server20PlasmaShellInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server20PlasmaShellInterfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server21OutputDeviceInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Server21OutputDeviceInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Server21PlasmaWindowInterfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server21ShellSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Server21ShellSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Server21SlideManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server21SlideManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server22ShadowManagerInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server22ShadowManagerInterfaceE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Server20IdleTimeoutInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server20IdleTimeoutInterfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Server20PlasmaShellInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server20PlasmaShellInterfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Server21PlasmaWindowInterfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Server21ShellSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
+  _ZTSN8KWayland6Server21ShellSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
+  _ZTSN8KWayland6Server22ShadowManagerInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server22ShadowManagerInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Server22SubCompositorInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server22SubCompositorInterfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTSN8KWayland6Server24ContrastManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server24ContrastManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTSN8KWayland6Server25OutputManagementInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Server25OutputManagementInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
   _ZTSN8KWayland6Server26DataDeviceManagerInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server26DataDeviceManagerInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTSN8KWayland6Server26QtExtendedSurfaceInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server26QtExtendedSurfaceInterfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server27PlasmaShellSurfaceInterfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server27QtSurfaceExtensionInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server27QtSurfaceExtensionInterfaceE at Base 4:5.3.95
 + _ZTSN8KWayland6Server28OutputConfigurationInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Server28OutputConfigurationInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTSN8KWayland6Server31PlasmaWindowManagementInterface7PrivateE at Base 4:5.3.95
 + _ZTSN8KWayland6Server31PlasmaWindowManagementInterfaceE at Base 4:5.3.95
++=======
+  _ZTSN8KWayland6Server26QtExtendedSurfaceInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server26QtExtendedSurfaceInterfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server27PlasmaShellSurfaceInterfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Server27QtSurfaceExtensionInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server27QtSurfaceExtensionInterfaceE at Base 4:5.4.0
+  _ZTSN8KWayland6Server31PlasmaWindowManagementInterface7PrivateE at Base 4:5.4.0
+  _ZTSN8KWayland6Server31PlasmaWindowManagementInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTSN8KWayland6Server6CursorE at Base 4:5.2.1+git20150228.0043+15.04
   _ZTSN8KWayland6Server6Global7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server6GlobalE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server7DisplayE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server8Resource7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTSN8KWayland6Server8ResourceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Server13BlurInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server13BlurInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server13IdleInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server13IdleInterfaceE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Server13IdleInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server13IdleInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Server13SeatInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server13SeatInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server14ShellInterface7PrivateE at Base 4:5.1.1+git20141128.0009
@@@ -1543,14 -1132,13 +2006,23 @@@
   _ZTVN8KWayland6Server14TouchInterface7PrivateE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTVN8KWayland6Server14TouchInterfaceE at Base 4:5.2.2+git20150326.0109+15.04
   _ZTVN8KWayland6Server15BufferInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Server15FakeInputDeviceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server15OutputChangeSetE at Base 4:5.4.2+git20151109.2356+15.10
++=======
+  _ZTVN8KWayland6Server15FakeInputDeviceE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Server15OutputInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server15OutputInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server15RegionInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server15RegionInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Server15ShadowInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server15ShadowInterfaceE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Server15ShadowInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server15ShadowInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Server16ClientConnectionE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server16PointerInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server16PointerInterfaceE at Base 4:5.1.1+git20141128.0009
@@@ -1562,8 -1148,8 +2034,13 @@@
   _ZTVN8KWayland6Server17KeyboardInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server18DataOfferInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server18DataOfferInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Server18FakeInputInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server18FakeInputInterfaceE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Server18FakeInputInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server18FakeInputInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Server19CompositorInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server19CompositorInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server19DataDeviceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
@@@ -1572,41 -1158,27 +2049,64 @@@
   _ZTVN8KWayland6Server19DataSourceInterfaceE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server19SubSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server19SubSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Server20BlurManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server20BlurManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server20DpmsManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server20DpmsManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server20IdleTimeoutInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server20IdleTimeoutInterfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server20PlasmaShellInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server20PlasmaShellInterfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server21OutputDeviceInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Server21OutputDeviceInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Server21PlasmaWindowInterfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server21ShellSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Server21ShellSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Server21SlideManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server21SlideManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server22ShadowManagerInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server22ShadowManagerInterfaceE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Server20IdleTimeoutInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server20IdleTimeoutInterfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Server20PlasmaShellInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server20PlasmaShellInterfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Server21PlasmaWindowInterfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Server21ShellSurfaceInterface7PrivateE at Base 4:5.1.1+git20141128.0009
+  _ZTVN8KWayland6Server21ShellSurfaceInterfaceE at Base 4:5.1.1+git20141128.0009
+  _ZTVN8KWayland6Server22ShadowManagerInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server22ShadowManagerInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Server22SubCompositorInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server22SubCompositorInterfaceE at Base 4:5.1.1+git20141128.0009
 + _ZTVN8KWayland6Server24ContrastManagerInterface7PrivateE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server24ContrastManagerInterfaceE at Base 4:5.4.1+git20150917.0854
 + _ZTVN8KWayland6Server25OutputManagementInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Server25OutputManagementInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
   _ZTVN8KWayland6Server26DataDeviceManagerInterface7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server26DataDeviceManagerInterfaceE at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + _ZTVN8KWayland6Server26QtExtendedSurfaceInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server26QtExtendedSurfaceInterfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server27PlasmaShellSurfaceInterfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server27QtSurfaceExtensionInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server27QtSurfaceExtensionInterfaceE at Base 4:5.3.95
 + _ZTVN8KWayland6Server28OutputConfigurationInterface7PrivateE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Server28OutputConfigurationInterfaceE at Base 4:5.4.2+git20151109.2356+15.10
 + _ZTVN8KWayland6Server31PlasmaWindowManagementInterface7PrivateE at Base 4:5.3.95
 + _ZTVN8KWayland6Server31PlasmaWindowManagementInterfaceE at Base 4:5.3.95
++=======
+  _ZTVN8KWayland6Server26QtExtendedSurfaceInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server26QtExtendedSurfaceInterfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Server27PlasmaShellSurfaceInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server27PlasmaShellSurfaceInterfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Server27QtSurfaceExtensionInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server27QtSurfaceExtensionInterfaceE at Base 4:5.4.0
+  _ZTVN8KWayland6Server31PlasmaWindowManagementInterface7PrivateE at Base 4:5.4.0
+  _ZTVN8KWayland6Server31PlasmaWindowManagementInterfaceE at Base 4:5.4.0
++>>>>>>> master
   _ZTVN8KWayland6Server6CursorE at Base 4:5.2.1+git20150228.0043+15.04
   _ZTVN8KWayland6Server6Global7PrivateE at Base 4:5.1.1+git20141128.0009
   _ZTVN8KWayland6Server6GlobalE at Base 4:5.1.1+git20141128.0009
@@@ -1615,28 -1187,15 +2115,42 @@@
   _ZTVN8KWayland6Server8ResourceE at Base 4:5.1.1+git20141128.0009
   _ZZNK8KWayland6Server15OutputInterface7Private12manufacturerMUlvE_clEvE15qstring_literal at Base 4:5.1.1+git20141128.0009
   _ZZNK8KWayland6Server15OutputInterface7Private5modelMUlvE_clEvE15qstring_literal at Base 4:5.1.1+git20141128.0009
 + _ZZNK8KWayland6Server21OutputDeviceInterface7Private12manufacturerMUlvE_clEvE15qstring_literal at Base 4:5.4.2+git20151109.2356+15.10
 + _ZZNK8KWayland6Server21OutputDeviceInterface7Private5modelMUlvE_clEvE15qstring_literal at Base 4:5.4.2+git20151109.2356+15.10
   _ZZNK8KWayland6Server7Display7Private10socketNameMUlvE_clEvE15qstring_literal at Base 4:5.1.1+git20141128.0009
++<<<<<<< HEAD
 + org_kde_kwin_blur_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_blur_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_contrast_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_contrast_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_dpms_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_dpms_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_fake_input_interface at Base 4:5.3.95
 + org_kde_kwin_idle_interface at Base 4:5.3.95
 + org_kde_kwin_idle_timeout_interface at Base 4:5.3.95
 + org_kde_kwin_outputconfiguration_interface at Base 4:5.4.2+git20151109.2356+15.10
 + org_kde_kwin_outputdevice_interface at Base 4:5.4.2+git20151109.2356+15.10
 + org_kde_kwin_outputmanagement_interface at Base 4:5.4.2+git20151109.2356+15.10
 + org_kde_kwin_shadow_interface at Base 4:5.3.95
 + org_kde_kwin_shadow_manager_interface at Base 4:5.3.95
 + org_kde_kwin_slide_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_kwin_slide_manager_interface at Base 4:5.4.1+git20150917.0854
 + org_kde_plasma_shell_interface at Base 4:5.3.95
 + org_kde_plasma_surface_interface at Base 4:5.3.95
 + org_kde_plasma_window_interface at Base 4:5.3.95
 + org_kde_plasma_window_management_interface at Base 4:5.3.95
 + qt_extended_surface_interface at Base 4:5.3.95
 + qt_surface_extension_interface at Base 4:5.3.95
++=======
+  org_kde_kwin_fake_input_interface at Base 4:5.4.0
+  org_kde_kwin_idle_interface at Base 4:5.4.0
+  org_kde_kwin_idle_timeout_interface at Base 4:5.4.0
+  org_kde_kwin_shadow_interface at Base 4:5.4.0
+  org_kde_kwin_shadow_manager_interface at Base 4:5.4.0
+  org_kde_plasma_shell_interface at Base 4:5.4.0
+  org_kde_plasma_surface_interface at Base 4:5.4.0
+  org_kde_plasma_window_interface at Base 4:5.4.0
+  org_kde_plasma_window_management_interface at Base 4:5.4.0
+  qt_extended_surface_interface at Base 4:5.4.0
+  qt_surface_extension_interface at Base 4:5.4.0
++>>>>>>> master

-- 
kwayland packaging



More information about the pkg-kde-commits mailing list