From 09e83913e9bfee232d436773a9a08f153aa00a70 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 17 Mar 2016 15:46:46 +0100 Subject: Cleanup QQuickProxyStyle Install and remove the proxy theme automatically to eliminate the need for TestTheme do it in tst_applicationwindow. Furthermore, fix some Qt coding conventions, align header guards, remove unneeded empty destructor, and add missing explicit keywords for one-parameter constructors and cleanup somemeaningless ones in paremeterless ctors. Change-Id: Ib95dad003e35e468e941f3a0d2be5b21323fcccd Reviewed-by: J-P Nurmi --- tests/auto/applicationwindow/tst_applicationwindow.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index 24c564ea..67525ef7 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -505,7 +505,6 @@ class TestTheme : public QQuickProxyTheme public: TestTheme(QPlatformTheme *theme) : QQuickProxyTheme(theme), m_font("Courier") { QGuiApplicationPrivate::platform_theme = this; } - ~TestTheme() { QGuiApplicationPrivate::platform_theme = theme(); } const QFont *font(Font type = SystemFont) const override { -- cgit v1.2.3