aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/widgets/qcustomplot.cpp
AgeCommit message (Collapse)AuthorFilesLines
2018-07-17Qt: update to QCustomPlot 1.3.2Peter Wu1-417/+512
QCustomPlot 1.3.1 includes a fix for a crash ("Fixed potential crash in QCPGraph::pointDistance if getScatterPlotData returns empty list"). Full changelog: http://www.qcustomplot.com/release/1.3.2/changelog.txt The new files are based on QCustomPlot-source.tar.gz (1.3.2) with Alexis' typo and license header changes from v1.99.2rc0-479-gc411029a3c ("Update to QCustomPlot 1.3.0") applied. All successive Wireshark patches up to v2.5.0rc0-854-g6f28f1a59e ("Fix MacOS build") were applied. The Retina patches ("Fix QCustmPlot retina problems." and "QCP: Fix retina label calculations.") gave conflicts due contextual changes which I resolved by renaming newCachedLabel to cachedLabel (following the change in upstream commit baaad24706187f5be0a68011c780b51c4de11558). Bug: 14971 Change-Id: I5012cb5a867891b466cbf1898fe4c28cbd11ba20 Reviewed-on: https://code.wireshark.org/review/28732 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-08-31Fix MacOS buildJim Young1-1/+1
Commit 8d13f14f958b9ee00b59fd869bd1630f76e6fa65 introduced a preprocessor buglet affecting MacOS builds. Change #if to #ifdef. Change-Id: I3d76c83428658abcf382e18066be0e24309ecbba Reviewed-on: https://code.wireshark.org/review/23317 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jim Young <jim.young.ws@gmail.com>
2017-08-30Qt: Temporarily disable DP scaling on non-macOS systems.Gerald Combs1-0/+4
Enable device pixel scaling in QCustomPlot only on macOS. Blind attempt at diagnosing / fixing bug 14012. Change-Id: I95e38eaa072d69aef0fe1d642951603800c3a280 Ping-Bug: 14012 Reviewed-on: https://code.wireshark.org/review/23314 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-07-26Qt: Move utils to separate utils directoryRoland Knall1-0/+23486
Following the move for widgets directory, moving utils to the utils directory. Guidelines for this directory are: - Generic use but not a widget - Utility functionality used by many classes Note: additionally all includes affected by this move have been changed to absolute path includes, instead of relative ones. Change-Id: I019ae4b6e6f6d06a5745a63ed195edbd36fb936b Reviewed-on: https://code.wireshark.org/review/22602 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>