diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-01-31 13:17:21 +0100 |
|---|---|---|
| committer | Jesús Fernández <jesus.fernandez@qt.io> | 2017-01-31 12:56:32 +0000 |
| commit | 7288759f544991bd8ea3571dd6132c008b1f45e9 (patch) | |
| tree | b01b4f9044994337195f1b063441431a713f8b51 /src/localesettings | |
| parent | cb97681ac8c88ebfc1543d4b1d5788f4db6b633b (diff) | |
Fix qmake warnings
Removes some "We mean it" and "QT_BEGIN_NAMESPACE" warnings.
Change-Id: Ia00b00e4e064814a1cb0dd2ca85a4bd888d58d26
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/localesettings')
| -rw-r--r-- | src/localesettings/localefiltermodel.h | 5 | ||||
| -rw-r--r-- | src/localesettings/localemodel.h | 5 | ||||
| -rw-r--r-- | src/localesettings/systemlocale.h | 4 | ||||
| -rw-r--r-- | src/localesettings/systemlocale_p.h | 11 |
4 files changed, 25 insertions, 0 deletions
diff --git a/src/localesettings/localefiltermodel.h b/src/localesettings/localefiltermodel.h index 6c839e4..3e768ea 100644 --- a/src/localesettings/localefiltermodel.h +++ b/src/localesettings/localefiltermodel.h @@ -29,8 +29,11 @@ #ifndef LOCALEFILTERMODEL_H #define LOCALEFILTERMODEL_H + #include <QSortFilterProxyModel> +QT_BEGIN_NAMESPACE + class Q_DECL_EXPORT LocaleFilterModel : public QSortFilterProxyModel { Q_OBJECT @@ -49,4 +52,6 @@ private: }; +QT_END_NAMESPACE + #endif // LOCALEFILTERMODEL_H diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h index 4fb00a0..2dcbe87 100644 --- a/src/localesettings/localemodel.h +++ b/src/localesettings/localemodel.h @@ -34,6 +34,8 @@ #include <QLocale> #include <QMutex> +QT_BEGIN_NAMESPACE + class LocaleItem : public QObject { Q_OBJECT @@ -85,4 +87,7 @@ private: QList<LocaleItem*> m_items; QHash<int, QByteArray> m_roleNames; }; + +QT_END_NAMESPACE + #endif // LOCALEMODEL_H diff --git a/src/localesettings/systemlocale.h b/src/localesettings/systemlocale.h index 075d397..b10c5a1 100644 --- a/src/localesettings/systemlocale.h +++ b/src/localesettings/systemlocale.h @@ -31,6 +31,8 @@ #include <QObject> +QT_BEGIN_NAMESPACE + class SystemLocalePrivate; class Q_DECL_EXPORT SystemLocale : public QObject @@ -52,4 +54,6 @@ protected: Q_DECLARE_PRIVATE(SystemLocale) }; +QT_END_NAMESPACE + #endif // LOCALE_H diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h index 761c5cd..96af3c1 100644 --- a/src/localesettings/systemlocale_p.h +++ b/src/localesettings/systemlocale_p.h @@ -29,6 +29,17 @@ #ifndef LOCALE_P_H #define LOCALE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "systemlocale.h" #include "locale_interface.h" |