ukui-settings-daemon/trunk/libkscreen-5.27.patch

   1 diff --git a/plugins/save-param/xrandr-output.cpp b/plugins/save-param/xrandr-output.cpp
   2 index 3497bf4..7ee0a89 100644
   3 --- a/plugins/save-param/xrandr-output.cpp
   4 +++ b/plugins/save-param/xrandr-output.cpp
   5 @@ -30,6 +30,7 @@
   6  #include <QRect>
   7  #include <QStandardPaths>
   8  #include <QtXml>
   9 +#include <KF5/KScreen/kscreen/mode.h>
  10  #include <KF5/KScreen/kscreen/output.h>
  11  #include <KF5/KScreen/kscreen/edid.h>
  12  #include "xrandr-config.h"
  13 diff --git a/plugins/xrandr/xrandr-manager.cpp b/plugins/xrandr/xrandr-manager.cpp
  14 index bbf12b5..b294c19 100644
  15 --- a/plugins/xrandr/xrandr-manager.cpp
  16 +++ b/plugins/xrandr/xrandr-manager.cpp
  17 @@ -950,7 +950,7 @@ void XrandrManager::outputRemoved(int outputId)
  18
  19  }
  20
  21 -void XrandrManager::primaryOutputChanged(const KScreen::OutputPtr &output)
  22 +void XrandrManager::primaryOutputChanged()
  23  {
  24  //    USD_LOG(LOG_DEBUG,".");
  25  }
  26 @@ -1197,7 +1197,7 @@ void XrandrManager::monitorsInit()
  27              mSaveConfigTimer->start(SAVE_CONFIG_TIME);
  28          });
  29
  30 -        connect(output.data(), &KScreen::Output::isPrimaryChanged, this, [this](){
  31 +        connect(output.data(), &KScreen::Output::priorityChanged, this, [this](){
  32              KScreen::Output *senderOutput = static_cast<KScreen::Output*> (sender());
  33              USD_LOG(LOG_DEBUG,"PrimaryChanged:%s",senderOutput->name().toLatin1().data());
  34
  35 @@ -1289,7 +1289,7 @@ void XrandrManager::monitorsInit()
  36              this, &XrandrManager::outputRemoved,
  37              static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
  38
  39 -    connect(mConfig.data(), &KScreen::Config::primaryOutputChanged,
  40 +    connect(mConfig.data(), &KScreen::Config::prioritiesChanged,
  41              this, &XrandrManager::primaryOutputChanged);
  42
  43      if (mMonitoredConfig->fileExists()) {
  44 diff --git a/plugins/xrandr/xrandr-manager.h b/plugins/xrandr/xrandr-manager.h
  45 index 33d0b60..c91c37c 100644
  46 --- a/plugins/xrandr/xrandr-manager.h
  47 +++ b/plugins/xrandr/xrandr-manager.h
  48 @@ -36,6 +36,7 @@
  49
  50
  51  #include <KF5/KScreen/kscreen/config.h>
  52 +#include <KF5/KScreen/kscreen/mode.h>
  53  #include <KF5/KScreen/kscreen/log.h>
  54  #include <KF5/KScreen/kscreen/output.h>
  55  #include <KF5/KScreen/kscreen/edid.h>
  56 @@ -130,7 +131,7 @@ public Q_SLOTS:
  57      void RotationChangedEvent(const QString &rotation);
  58      void outputAddedHandle(const KScreen::OutputPtr &output);
  59      void outputRemoved(int outputId);
  60 -    void primaryOutputChanged(const KScreen::OutputPtr &output);
  61 +    void primaryOutputChanged();
  62     // void applyConfigTimerHandle();
  63      void setScreenMode(QString modeName);
  64      void setScreensParam(QString screensParam);
  65 diff --git a/plugins/xrandr/xrandr-output.cpp b/plugins/xrandr/xrandr-output.cpp
  66 index d18cf4f..4e125b8 100644
  67 --- a/plugins/xrandr/xrandr-output.cpp
  68 +++ b/plugins/xrandr/xrandr-output.cpp
  69 @@ -30,6 +30,7 @@
  70  #include <QRect>
  71  #include <QStandardPaths>
  72  #include <QtXml>
  73 +#include <KF5/KScreen/kscreen/mode.h>
  74  #include <KF5/KScreen/kscreen/output.h>
  75  #include <KF5/KScreen/kscreen/edid.h>
  76  #include "xrandr-config.h"