summaryrefslogtreecommitdiffstats
path: root/src/timedatesettings
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2017-01-31 13:17:21 +0100
committerJesús Fernández <jesus.fernandez@qt.io>2017-01-31 12:56:32 +0000
commit7288759f544991bd8ea3571dd6132c008b1f45e9 (patch)
treeb01b4f9044994337195f1b063441431a713f8b51 /src/timedatesettings
parentcb97681ac8c88ebfc1543d4b1d5788f4db6b633b (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/timedatesettings')
-rw-r--r--src/timedatesettings/systemtime.h4
-rw-r--r--src/timedatesettings/systemtime_p.h11
-rw-r--r--src/timedatesettings/timezonefiltermodel.h15
-rw-r--r--src/timedatesettings/timezonemodel.h4
4 files changed, 34 insertions, 0 deletions
diff --git a/src/timedatesettings/systemtime.h b/src/timedatesettings/systemtime.h
index f7ad593..bcb46df 100644
--- a/src/timedatesettings/systemtime.h
+++ b/src/timedatesettings/systemtime.h
@@ -32,6 +32,8 @@
#include <QObject>
#include <QTime>
+QT_BEGIN_NAMESPACE
+
class SystemTimePrivate;
class Q_DECL_EXPORT SystemTime : public QObject
@@ -63,4 +65,6 @@ protected:
Q_DECLARE_PRIVATE(SystemTime)
};
+QT_END_NAMESPACE
+
#endif // SYSTEMTIME_H
diff --git a/src/timedatesettings/systemtime_p.h b/src/timedatesettings/systemtime_p.h
index d4ff4d4..7cdb135 100644
--- a/src/timedatesettings/systemtime_p.h
+++ b/src/timedatesettings/systemtime_p.h
@@ -29,6 +29,17 @@
#ifndef SYSTEMTIME_P_H
#define SYSTEMTIME_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 "systemtime.h"
#include "timedated_interface.h"
diff --git a/src/timedatesettings/timezonefiltermodel.h b/src/timedatesettings/timezonefiltermodel.h
index 9585801..2b4ec2b 100644
--- a/src/timedatesettings/timezonefiltermodel.h
+++ b/src/timedatesettings/timezonefiltermodel.h
@@ -29,8 +29,21 @@
#ifndef TIMEZONEFILTERMODEL_H
#define TIMEZONEFILTERMODEL_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 <QSortFilterProxyModel>
+QT_BEGIN_NAMESPACE
+
class Q_DECL_EXPORT TimezoneFilterModel : public QSortFilterProxyModel
{
Q_OBJECT
@@ -49,4 +62,6 @@ private:
};
+QT_END_NAMESPACE
+
#endif // TIMEZONEFILTERMODEL_H
diff --git a/src/timedatesettings/timezonemodel.h b/src/timedatesettings/timezonemodel.h
index 485fd17..14d7a2c 100644
--- a/src/timedatesettings/timezonemodel.h
+++ b/src/timedatesettings/timezonemodel.h
@@ -34,6 +34,8 @@
#include <QTimeZone>
#include <QMutex>
+QT_BEGIN_NAMESPACE
+
class TimezoneItem : public QObject
{
Q_OBJECT
@@ -80,4 +82,6 @@ private:
QHash<int, QByteArray> m_roleNames;
};
+QT_END_NAMESPACE
+
#endif // TIMEZONEMODEL_H