diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-08-31 11:50:01 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-09-07 14:55:24 +0200 |
| commit | f7313c2cec4f9c70dfeade827ba18c40c1b3331e (patch) | |
| tree | d8c173aba62aa182d69ccc69377611a421d8000f | |
| parent | 12d3882879401372e6fd5296144dca0c7368dc49 (diff) | |
Native style: fix namespace builds
Change-Id: I7ef28cc93fd4acad9849fecb3d4c2cab79f0acdb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/nativestyle/items/qquickstyleitem.h | 4 | ||||
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/nativestyle/items/qquickstyleitem.h b/src/imports/nativestyle/items/qquickstyleitem.h index ad315b96..daffa16f 100644 --- a/src/imports/nativestyle/items/qquickstyleitem.h +++ b/src/imports/nativestyle/items/qquickstyleitem.h @@ -267,8 +267,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickStyleItem::DirtyFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickStyleItem::DebugFlags) #endif -QML_DECLARE_TYPE(QQuickStyleItem) - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickStyleItem) + #endif // QQUICKSTYLEITEM_H diff --git a/src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h b/src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h index 29815280..59f1afac 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h +++ b/src/imports/nativestyle/qstyle/qquickcommonstylepixmaps_p.h @@ -47,6 +47,8 @@ // We mean it. // +QT_BEGIN_NAMESPACE + namespace QQC2 { static const char * const check_list_controller_xpm[] = { @@ -525,4 +527,6 @@ static const char *const question_xpm[] = { } // namespace QQC2 +QT_END_NAMESPACE + #endif //QT_NO_IMAGEFORMAT_XPM |