aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/applicationwindow
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-17 15:46:46 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-03-18 22:14:34 +0000
commit09e83913e9bfee232d436773a9a08f153aa00a70 (patch)
tree0b907bd45dd57a2d7f410f755a0f2868aa5147c5 /tests/auto/applicationwindow
parent94136244c58ed035be44183bd8eb00314bccf7df (diff)
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 <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/applicationwindow')
-rw-r--r--tests/auto/applicationwindow/tst_applicationwindow.cpp1
1 files changed, 0 insertions, 1 deletions
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
{