diff options
Diffstat (limited to 'src/imports/controls/universal/qquickuniversaltheme_p.h')
| -rw-r--r-- | src/imports/controls/universal/qquickuniversaltheme_p.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h index 20243917..e2a3a436 100644 --- a/src/imports/controls/universal/qquickuniversaltheme_p.h +++ b/src/imports/controls/universal/qquickuniversaltheme_p.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QQUICKUNIVERSALTHEME_H -#define QQUICKUNIVERSALTHEME_H +#ifndef QQUICKUNIVERSALTHEME_P_H +#define QQUICKUNIVERSALTHEME_P_H // // W A R N I N G @@ -48,20 +48,17 @@ // We mean it. // -#include <QtGui/qpa/qplatformtheme.h> #include <QtGui/qfont.h> -#include <QtLabsControls/private/qquickproxytheme_p.h> +#include <QtQuickControls2/private/qquickproxytheme_p.h> QT_BEGIN_NAMESPACE class QQuickUniversalTheme : public QQuickProxyTheme { public: - QQuickUniversalTheme(QPlatformTheme *theme); + explicit QQuickUniversalTheme(QPlatformTheme *theme = nullptr); - ~QQuickUniversalTheme(); - - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; + const QFont *font(Font type = SystemFont) const override; private: QFont systemFont; @@ -71,4 +68,4 @@ private: QT_END_NAMESPACE -#endif // QQUICKUNIVERSALTHEME_H +#endif // QQUICKUNIVERSALTHEME_P_H |