Merge branch 'dev'

Author: legerch

CHANGELOG.md

@@ -3,11 +3,14 @@
 All notable changes to this project will be documented in this file.  
 The format is based on [Keep a Changelog] and this project adheres to [Semantic Versioning].
 
-## [next] - 2.1.0.3
+## [next] - 2.1.1.2
+
+## [2.1.1.1] - 2023-03-31
+### Changed
+- Update upstream version from **2.1.0** to **2.1.1**
 
 ## [2.1.0.2] - 2022-01-10
 ### Fixed
-
 - Fix compilation issues with `Qt >= 6.2.0` (thanks to _miccs_ on thread forum [qt 6.2 patch][path-qt-6.2])
 
 ## [2.1.0.1] - 2022-01-10
@@ -22,7 +25,9 @@ Creation of the repository which provides :
 [semantic versioning]: https://semver.org/spec/v2.0.0.html
 
 <!-- Versions -->
-[next]: https://github.com/leger50/QCustomPlot-library/compare/2.1.0.2...dev
+[next]: https://github.com/leger50/QCustomPlot-library/compare/2.1.1.1...dev
+
+[2.1.1.1]: https://github.com/leger50/QCustomPlot-library/compare/2.1.0.2...2.1.1.1
 [2.1.0.2]: https://github.com/leger50/QCustomPlot-library/compare/2.1.0.1...2.1.0.2
 [2.1.0.1]: https://github.com/leger50/QCustomPlot-library/releases/tag/2.1.0.1
 

README.md

@@ -16,6 +16,7 @@ This repository also provide a [changelog][changelog-repo] in order to track cha
 
 | Library version | Qt compatibility |
 | :-: | :-: |
+| [2.1.1.1][tag-2.1.1.1] | `Qt 4.6.x` -> `Qt 6.4.x` |
 | [2.1.0.2][tag-2.1.0.2] | `Qt 5.8.x` -> `Qt 6.2.x` |
 | [2.1.0.1][tag-2.1.0.1] | `Qt 4.6.x` -> `Qt 6.0.0` |
 
@@ -57,5 +58,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE QCUSTOMPLOT_USE_LIBRARY)
 [changelog-official]: https://github.com/leger50/QCustomPlot-library/blob/dev/changelog-official.txt
 [license]: https://github.com/leger50/QCustomPlot-library/blob/master/LICENSE.md
 
+[tag-2.1.1.1]: https://github.com/leger50/QCustomPlot-library/releases/tag/2.1.1.1
 [tag-2.1.0.2]: https://github.com/leger50/QCustomPlot-library/releases/tag/2.1.0.2
 [tag-2.1.0.1]: https://github.com/leger50/QCustomPlot-library/releases/tag/2.1.0.1

changelog-official.txt

@@ -1,3 +1,21 @@
+#### Version 2.1.1 released on 06.11.22 ####
+
+Added features:
+  - Qt6.4 Compatibility
+
+Bugfixes:
+  - dynamically changing device pixel ratios (e.g. when moving between different DPI screens) is handled properly
+  - bugfix Colormap autoscaling: recalculateDataBounds() if (0, 0) data point is NaN.
+  - minor bugfix in getMantissa for certain values due to rounding errors
+  - Graphs with line style lsImpulse properly ignore NaN data points
+  - fixed issue where QCP wasn't greyed out together with the rest of the UI on embedded systems when a modal dialog is shown
+        (QCustomPlot no longer has the Qt::WA_OpaquePaintEvent attribute enabled by default)
+
+Other:
+  - in QCPAxisPainterPrivate::getTickLabelData, don't use fixed 'e', but locale aware character of parent plot locale
+  - Axis rescaling now ignores +/- Inf in data values
+  - slight performance improvements of QCPColorMap colorization and fills.
+
 #### Version 2.1.0 released on 29.03.21 ####
 
 Added features:

lib/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 
 # Set project properties
 set(PROJECT_NAME qcustomplot)
-set(PROJECT_VERSION_SEMANTIC 2.1.0.2)
+set(PROJECT_VERSION_SEMANTIC 2.1.1.1)
 set(PROJECT_VERSION_CPP_MIN 11)
 
 # Set project options