Merge branch 'development' of https://github.com/o3de/o3de into daimini/dpiIssues/floatingWidgetFlickerBetweenScreens

2021-09-15 14:52:35 -07:00
parent 50e4d549f4 b2445ebe0c
commit 0413f3b7e2
516 changed files with 4591 additions and 2787 deletions
@@ -137,8 +137,10 @@ namespace AzQtComponents

        int pixelMetric(QStyle::PixelMetric metric, const QStyleOption* option, const QWidget* widget) const override;

+        using QProxyStyle::polish;
        void polish(QApplication* application) override;
        void polish(QWidget* widget) override;
+        using QProxyStyle::unpolish;
        void unpolish(QWidget* widget) override;

        QPalette standardPalette() const override;