Set minimum qt version to 5.7 for qbs and cmake build, Finalize chang…

…e log for 1.5.0
MEONMedical · Jun 25, 2018 · 70d037a · 70d037a
1 parent ea5180d
commit 70d037a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,7 +56,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 # and settings some defines for Qt
 #
 set(CMAKE_AUTOMOC TRUE)
-set(QT_MIN_VERSION 5.6.0)
+set(QT_MIN_VERSION 5.7.0)
 # TODO: make Network also optional?
 find_package(Qt5 COMPONENTS Core Network Test REQUIRED)
 if(BUILD_WITH_DB_LOGGING)
@@ -71,7 +71,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII)
 #add_definitions(-DQT_NO_CAST_FROM_ASCII)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_definitions(-DQT_DEPRECATED_WARNINGS)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050600)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050700)
 if(NOT MSVC)
     add_definitions(-DQT_STRICT_ITERATORS)
 endif()

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,18 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 ----
-## [v1.5.0] - ????
+## [v1.5.0] - 25.06.2018
 ### Improvements
 - RollingFileAppender: Changed the behavior on application restart and if
                        appendFile is set to false to avoid data loss. The
                        existing log files are rolled instead of overwritten.
                        This behavior is different to the log4/log4cpp implementation.
-
 - Modernize c++ and qt usage wit clang-tidy and clazy
 
 ### Fixed
 - Fixed "DATE" format string, it will be formatted as MMM YYYY HH:mm:ss.zzz
 - Minimum required Qt version is 5.7
+- Move color console appender to windows only (is only implemented for windows),
+  unified windows os preprocessor switches
 
 ## [v1.4.2] - 2017-09-06
 ### Improvements

diff --git a/build.pri b/build.pri
@@ -12,5 +12,5 @@ DEFINES += LOG4QT_VERSION_MINOR=$${LOG4QT_VERSION_MINOR}
 DEFINES += LOG4QT_VERSION_PATCH=$${LOG4QT_VERSION_PATCH}
 DEFINES += LOG4QT_VERSION_STR='\\"$${LOG4QT_VERSION_MAJOR}.$${LOG4QT_VERSION_MINOR}.$${LOG4QT_VERSION_PATCH}\\"'
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050600
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050700
 DEFINES += QT_DEPRECATED_WARNINGS
diff --git a/log4qtlib.qbs b/log4qtlib.qbs
@@ -5,7 +5,7 @@ Product {
 
     destinationDirectory: "../bin"
     Depends { name: 'cpp' }
-    Depends { name: "Qt"; submodules: ["core", "xml"] }
+    Depends { name: "Qt"; submodules: ["core", "xml"]; versionAtLeast: "5.7.0" }
     Depends { name: "Qt.sql"; required: false }
     Depends { name: "Qt.network"; required: false }
 

diff --git a/src/log4qt/log4qt.qbs b/src/log4qt/log4qt.qbs
@@ -15,7 +15,7 @@ ProductLibrary {
     cpp.defines: ["LOG4QT_LIBRARY",
                   "NOMINMAX",
                   "QT_DEPRECATED_WARNINGS",
-                  "QT_DISABLE_DEPRECATED_BEFORE=0x050600",
+                  "QT_DISABLE_DEPRECATED_BEFORE=0x050700",
                   "QT_NO_CAST_FROM_BYTEARRAY",
                   "QT_USE_QSTRINGBUILDER",
                   "LOG4QT_VERSION_STR=\"" + library.version + "\"",