diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-04 12:48:56 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-04 12:49:37 +0200 |
| commit | b5eea82532059738a7da751222ebef68539508f1 (patch) | |
| tree | c6dad2476eed9ffb29076a51c928baf2ce500c10 /src/localesettings | |
| parent | 61e9e8c83e817b3692beae03bd8e683d247207b0 (diff) | |
| parent | 724309463d63480ca755d5f309825a9dd078d012 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
* origin/5.9:
Fix compilation with namespaces
Import only available modules
Update license headers
Verify that Qtdbus module is available
tests: add tests.pro for CI
Doc: Bump version to 5.9.3
Conflicts:
.qmake.conf
Change-Id: I83f4f8a507586d50423d0a2bb1dd4b69557b38ed
Diffstat (limited to 'src/localesettings')
| -rw-r--r-- | src/localesettings/localefiltermodel.cpp | 3 | ||||
| -rw-r--r-- | src/localesettings/localemodel.cpp | 3 | ||||
| -rw-r--r-- | src/localesettings/systemlocale.cpp | 4 | ||||
| -rw-r--r-- | src/localesettings/systemlocale_p.h | 4 |
4 files changed, 14 insertions, 0 deletions
diff --git a/src/localesettings/localefiltermodel.cpp b/src/localesettings/localefiltermodel.cpp index d45fac6..186a9c8 100644 --- a/src/localesettings/localefiltermodel.cpp +++ b/src/localesettings/localefiltermodel.cpp @@ -29,6 +29,8 @@ #include "localemodel.h" #include "localefiltermodel.h" +QT_BEGIN_NAMESPACE + LocaleFilterModel::LocaleFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -89,3 +91,4 @@ QVariant LocaleFilterModel::itemFromRow(const int row) const return QVariant(); } +QT_END_NAMESPACE diff --git a/src/localesettings/localemodel.cpp b/src/localesettings/localemodel.cpp index b5a934b..a5112ed 100644 --- a/src/localesettings/localemodel.cpp +++ b/src/localesettings/localemodel.cpp @@ -33,6 +33,7 @@ #include <QtConcurrent/QtConcurrentRun> #include "localemodel.h" +QT_BEGIN_NAMESPACE LocaleItem::LocaleItem(const QLocale& locale, QObject *parent) :QObject(parent) @@ -158,3 +159,5 @@ void LocaleModel::sort(int column, Qt::SortOrder order) Q_UNUSED(order); std::sort(m_items.begin(), m_items.end(), LocaleModel::variantLessThan); } + +QT_END_NAMESPACE diff --git a/src/localesettings/systemlocale.cpp b/src/localesettings/systemlocale.cpp index 37f157b..e6de431 100644 --- a/src/localesettings/systemlocale.cpp +++ b/src/localesettings/systemlocale.cpp @@ -30,6 +30,8 @@ #include "systemlocale.h" #include "systemlocale_p.h" +QT_BEGIN_NAMESPACE + SystemLocale::SystemLocale(QObject *parent) :QObject(parent) ,d_ptr(new SystemLocalePrivate(this)) @@ -48,3 +50,5 @@ void SystemLocale::setLocale(const QString& aLocale) d->setLocale(aLocale); emit localeChanged(); } + +QT_END_NAMESPACE diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h index 96af3c1..a3d1a5f 100644 --- a/src/localesettings/systemlocale_p.h +++ b/src/localesettings/systemlocale_p.h @@ -43,6 +43,8 @@ #include "systemlocale.h" #include "locale_interface.h" +QT_BEGIN_NAMESPACE + class SystemLocalePrivate { Q_DECLARE_PUBLIC(SystemLocale) @@ -88,4 +90,6 @@ private: SystemLocale *q_ptr; }; +QT_END_NAMESPACE + #endif // LOCALE_P_H |