fix: build errors and add support for Qt6
This commit is contained in:
1 parent
cbefa2be2e
commit
acb04c2360
22 files changed
+13978
-14748
No files matched your search
+8
-1
@@ -2,7 +2,14 @@
|
||||
# CMakeLists for qcustomplot
|
||||
#
|
||||
|
||||
if(${USE_QT6})
|
||||
FIND_PACKAGE(Qt6 REQUIRED COMPONENTS Core Gui Widgets PrintSupport)
|
||||
IF (NOT Qt6_FOUND)
|
||||
FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport)
|
||||
ENDIF()
|
||||
|
||||
SET(qcustomplot_SRCS qcustomplot.cpp qcustomplot.h)
|
||||
|
||||
@@ -13,5 +20,5 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
ENDIF()
|
||||
|
||||
ADD_LIBRARY(QCustomPlotLib STATIC ${qcustomplot_SRCS})
|
||||
TARGET_LINK_LIBRARIES(QCustomPlotLib Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport)
|
||||
TARGET_LINK_LIBRARIES(QCustomPlotLib Qt::Core Qt::Gui Qt::Widgets Qt::PrintSupport)
|
||||
TARGET_INCLUDE_DIRECTORIES(QCustomPlotLib PUBLIC .)
|
||||
+18
@@ -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:
|
||||
|
||||
+10309
-10898
File diff suppressed because it is too large.
Load diff
+3453
-3706
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user