diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-19 11:53:05 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-19 11:57:48 +0200 |
commit | 44d7f1865af8a8b4491f2d272f9e8e16f09c741b (patch) | |
tree | ab9b7cd2d5986e9707dad18f8447be3cc469d468 /src/timedatesettings | |
parent | 34ed89b61c06c4674260aa6f5f3139aa6310aee5 (diff) | |
parent | b5eea82532059738a7da751222ebef68539508f1 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
Merge remote-tracking branch 'origin/5.9' into 5.10
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:
src/bluetoothsettings/discoverymodel.cpp
src/localesettings/localefiltermodel.cpp
src/localesettings/localemodel.cpp
src/timedatesettings/timezonefiltermodel.cpp
Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1
Diffstat (limited to 'src/timedatesettings')
-rw-r--r-- | src/timedatesettings/systemtime.cpp | 4 | ||||
-rw-r--r-- | src/timedatesettings/systemtime_p.h | 3 | ||||
-rw-r--r-- | src/timedatesettings/timezonefiltermodel.cpp | 4 | ||||
-rw-r--r-- | src/timedatesettings/timezonemodel.cpp | 4 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/timedatesettings/systemtime.cpp b/src/timedatesettings/systemtime.cpp index 32e6e51..ce97899 100644 --- a/src/timedatesettings/systemtime.cpp +++ b/src/timedatesettings/systemtime.cpp @@ -29,6 +29,8 @@ #include "systemtime.h" #include "systemtime_p.h" +QT_BEGIN_NAMESPACE + SystemTime::SystemTime(QObject *parent) : QObject(parent) ,d_ptr(new SystemTimePrivate(this)) @@ -76,3 +78,5 @@ QDateTime SystemTime::time() const { return QDateTime::currentDateTime(); } + +QT_END_NAMESPACE diff --git a/src/timedatesettings/systemtime_p.h b/src/timedatesettings/systemtime_p.h index 7cdb135..a6ab646 100644 --- a/src/timedatesettings/systemtime_p.h +++ b/src/timedatesettings/systemtime_p.h @@ -43,6 +43,8 @@ #include "systemtime.h" #include "timedated_interface.h" +QT_BEGIN_NAMESPACE + class SystemTimePrivate { Q_DECLARE_PUBLIC(SystemTime) @@ -88,5 +90,6 @@ private: SystemTime *q_ptr; }; +QT_END_NAMESPACE #endif // SYSTEMTIME_P_H diff --git a/src/timedatesettings/timezonefiltermodel.cpp b/src/timedatesettings/timezonefiltermodel.cpp index 6825c14..b566624 100644 --- a/src/timedatesettings/timezonefiltermodel.cpp +++ b/src/timedatesettings/timezonefiltermodel.cpp @@ -29,6 +29,8 @@ #include "timezonemodel.h" #include "timezonefiltermodel.h" +QT_BEGIN_NAMESPACE + TimezoneFilterModel::TimezoneFilterModel(QObject* parent) :QSortFilterProxyModel(parent) { @@ -112,3 +114,5 @@ int TimezoneFilterModel::indexForTimezone(const QString &timezone) const return -1; } + +QT_END_NAMESPACE diff --git a/src/timedatesettings/timezonemodel.cpp b/src/timedatesettings/timezonemodel.cpp index 58837ba..8983a49 100644 --- a/src/timedatesettings/timezonemodel.cpp +++ b/src/timedatesettings/timezonemodel.cpp @@ -33,6 +33,8 @@ #include <QtConcurrent/QtConcurrentRun> #include "timezonemodel.h" +QT_BEGIN_NAMESPACE + TimezoneItem::TimezoneItem(const QByteArray& id, QObject *parent) :QObject(parent) { @@ -134,3 +136,5 @@ QVariant TimezoneModel::data(const QModelIndex & index, int role) const return QVariant(); } } + +QT_END_NAMESPACE |