Merge branch 'Plasma/5.17'

2019-10-01 15:34:14 +03:00 · 2019-10-01 15:34:14 +03:00 · 493bbdc24a
parent 39dca35d44 6ee6cc0293
commit 493bbdc24a
1 changed files with 0 additions and 1 deletions
--- a/plugins/platforms/hwcomposer/hwcomposer_backend.h
+++ b/plugins/platforms/hwcomposer/hwcomposer_backend.h
@ -55,7 +55,6 @@ public:
    ~HwcomposerOutput() override;
    bool isValid() const;

-    QSize pixelSize() const override;
    void updateDpms(KWayland::Server::OutputInterface::DpmsMode mode) override;
 Q_SIGNALS:
    void dpmsModeRequested(KWayland::Server::OutputInterface::DpmsMode mode);