Compatibility with Qt5.x

Author: andibacher

ChangeLog.md

@@ -4,12 +4,14 @@ All notable changes to this project will be documented in this file.
 ----
 ## [v1.6.0] - ??
 ### Improvements
+
 - Support for Qt6
 - Minimum required Qt version is 5.12
 - Add case sensitivity option in Stringmatchfilter
 - cmake: replace BUILD_STATIC_LOG4CXX_LIB with standard BUILD_SHARED_LIBS
 
 ### Fixed
+- Fixes for Qt6.7
 - Replace deprecated Qt 5.15 stuff
 
 ## [v1.5.1] - 14.02.2020

src/log4qt/CMakeLists.txt

@@ -80,6 +80,7 @@ set(log4qt_HEADERS
     hierarchy.h
     layout.h
     level.h
+    log4qtdefs.h
     log4qt.h
     log4qtshared.h
     log4qtsharedptr.h

src/log4qt/appender.h

@@ -22,6 +22,7 @@
 #define LOG4QT_APPENDER_H
 
 #include "layout.h"
+#include "log4qtdefs.h"
 #include "log4qtsharedptr.h"
 #include "spi/filter.h"
 #include "helpers/classlogger.h"

src/log4qt/basicconfigurator.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_BASICCONFIGURATOR_H
 #define LOG4QT_BASICCONFIGURATOR_H
 
+#include "log4qtdefs.h"
 #include "log4qt.h"
 
 namespace Log4Qt

src/log4qt/helpers/configuratorhelper.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_HELPERS_CONFIGURATORHELPER_H
 #define LOG4QT_HELPERS_CONFIGURATORHELPER_H
 
+#include "log4qt/log4qtdefs.h"
 #include "log4qt/log4qtshared.h"
 #include "log4qt/loggingevent.h"
 

src/log4qt/helpers/factory.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_HELPERS_FACTORY_H
 #define LOG4QT_HELPERS_FACTORY_H
 
+#include "log4qt/log4qtdefs.h"
 #include "log4qt/log4qtshared.h"
 
 #include <QHash>

src/log4qt/helpers/initialisationhelper.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_HELPERS_INITIALISATIONHELPER_H
 #define LOG4QT_HELPERS_INITIALISATIONHELPER_H
 
+#include "log4qt/log4qtdefs.h"
 #include "log4qt/log4qtshared.h"
 
 #include <QHash>

src/log4qt/helpers/optionconverter.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_OPTIONCONVERTER_H
 #define LOG4QT_OPTIONCONVERTER_H
 
+#include "log4qt/log4qtdefs.h"
 #include "log4qt/log4qtshared.h"
 #include "log4qt/level.h"
 

src/log4qt/helpers/patternformatter.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_PATTERNFORMATTER_H
 #define LOG4QT_PATTERNFORMATTER_H
 
+#include "log4qt/log4qtdefs.h"
 #include "log4qt/log4qtshared.h"
 
 #include <QList>

src/log4qt/layout.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_LAYOUT_H
 #define LOG4QT_LAYOUT_H
 
+#include "log4qtdefs.h"
 #include "log4qt.h"
 #include "log4qtsharedptr.h"
 

src/log4qt/log4qt.h

@@ -475,12 +475,6 @@
 #   error "Log4Qt requires at least clang version 3.3 or higher for used c++11 features"
 #endif
 
-// use Q_DISABLE_COPY for Qt version prior to 5.13.0
-#ifndef Q_DISABLE_COPY_MOVE
-#define Q_DISABLE_COPY_MOVE(Class) \
-Q_DISABLE_COPY(Class)
-#endif
-
 /*
    LOG4QT_VERSION is (major << 16) + (minor << 8) + patch.
 */

src/log4qt/log4qtdefs.h

@@ -0,0 +1,16 @@
+#ifndef LOG4QTDEFS_H
+#define LOG4QTDEFS_H
+
+#include <QtGlobal>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QtClassHelperMacros>
+#endif
+
+// use Q_DISABLE_COPY for Qt version prior to 5.13.0
+#ifndef Q_DISABLE_COPY_MOVE
+#define Q_DISABLE_COPY_MOVE(Class) \
+Q_DISABLE_COPY(Class)
+#endif
+
+#endif // LOG4QTDEFS_H

src/log4qt/mdc.h

@@ -21,6 +21,7 @@
 #ifndef LOG4QT_MDC_H
 #define LOG4QT_MDC_H
 
+#include "log4qtdefs.h"
 #include "log4qt.h"
 
 #include <QString>

src/log4qt/ndc.h

@@ -21,7 +21,8 @@
 #ifndef LOG4QT_NDC_H
 #define LOG4QT_NDC_H
 
-#include "log4qt.h"
+#include "log4qtdefs.h"
+#include "log4qtshared.h"
 
 #include <QString>
 #include <QStack>