Merge branch 'master-bitbucket' into master-origin

# Conflicts:
#	CMakeLists.txt
#	src/log4qt/CMakeLists.txt
#	src/log4qt/helpers/datetime.h
#	src/log4qt/helpers/factory.cpp
#	src/log4qt/logmanager.cpp
#	src/log4qt/qmllogger.h
#	src/log4qt/telnetappender.cpp

Author: andibacher

src/log4qt/CMakeLists.txt

@@ -239,7 +239,7 @@ if(BUILD_WITH_TELNET_LOGGING)
     target_compile_definitions(log4qt
         PRIVATE
             LOG4QT_TELNET_LOGGING_SUPPORT
-)
+    )
     target_link_libraries(log4qt PRIVATE Qt${QT_VERSION_MAJOR}::Network)
     target_include_directories(log4qt
           PUBLIC

src/log4qt/helpers/datetime.h

@@ -56,19 +56,25 @@ class LOG4QT_EXPORT DateTime : public QDateTime
 
     DateTime(const DateTime &other);
 
+#if QT_VERSION < 0x060500
     /*!
      * Constructs a datetime with the given \a date and \a time, using
      * the time specification defined by \a timeSpec.
      *
      * \sa QDateTime::QDateTime(const QDate &date, const QTime &time,
      *     Qt::TimeSpec timeSpec = Qt::LocalTime)
      */
-#if QT_VERSION < 0x060500
     DateTime(QDate date,
              QTime time,
              Qt::TimeSpec timeSpec = Qt::LocalTime);
 #else
-
+    /*!
+     * Constructs a datetime with the given \a date and \a time, using
+     * the time zone defined by \a QTimeZone.
+     *
+     * \sa QDateTime::QDateTime(const QDate &date, const QTime &time,
+     *     QTimeZone = QTimeZone(QTimeZone::LocalTime))
+     */
     DateTime(QDate date,
              QTime time,
              QTimeZone = QTimeZone(QTimeZone::LocalTime));

src/log4qt/logmanager.cpp

@@ -353,7 +353,7 @@ void LogManager::welcome()
         {
             QDateTime utc = start_time.toUTC();
             QDateTime local = start_time.toLocalTime();
-            QDateTime local_as_utc = QDateTime(local.date(), local.time(), QTimeZone(Qt::UTC));
+            QDateTime local_as_utc = QDateTime(local.date(), local.time(), QTimeZone::utc());
             int min = utc.secsTo(local_as_utc) / 60;
             if (min < 0)
                 offset += QLatin1Char('-');

src/log4qt/qmllogger.h

@@ -26,7 +26,9 @@
 #include "level.h"
 
 #include <QObject>
+#if QT_VERSION >= 0x060500
 #include <QtQml/qqmlregistration.h>
+#endif
 
 namespace Log4Qt
 {
@@ -57,7 +59,10 @@ class LOG4QT_EXPORT QmlLogger : public QObject
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QString context READ context WRITE setContext NOTIFY contextChanged)
     Q_PROPERTY(Level level READ level WRITE setLevel NOTIFY levelChanged)
+#if QT_VERSION >= 0x060500
     QML_NAMED_ELEMENT(Logger)
+#endif
+
 
 public:
     enum Level