diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-10-01 04:13:31 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-10-01 04:13:31 +0000 |
commit | c45de9579f6ec97574056dd335df02031ccd00ad (patch) | |
tree | bf42b7c476faa7a6183d0feaa4c65bb90053847d /graphics/fractgen | |
parent | 4c6b47d49f526e4aa085f3d82bef3b2910453e64 (diff) | |
download | ports-c45de9579f6ec97574056dd335df02031ccd00ad.tar.gz ports-c45de9579f6ec97574056dd335df02031ccd00ad.zip |
Qt5 update to 5.13.0
For new features, check: https://wiki.qt.io/New_Features_in_Qt_5.13
Thanks to adridg who helped to fix a lot of packages.
Exp-run by: antoine
PR: 238782
Notes
Notes:
svn path=/head/; revision=513447
Diffstat (limited to 'graphics/fractgen')
-rw-r--r-- | graphics/fractgen/files/patch-src_colorschemeinterface.cc | 19 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_fractalalgorithminterface.cc | 19 |
2 files changed, 38 insertions, 0 deletions
diff --git a/graphics/fractgen/files/patch-src_colorschemeinterface.cc b/graphics/fractgen/files/patch-src_colorschemeinterface.cc new file mode 100644 index 000000000000..b34835d7b3ce --- /dev/null +++ b/graphics/fractgen/files/patch-src_colorschemeinterface.cc @@ -0,0 +1,19 @@ +--- src/colorschemeinterface.cc.orig 2019-09-01 12:18:45 UTC ++++ src/colorschemeinterface.cc +@@ -24,6 +24,7 @@ + + #include <string.h> + ++#include <algorithm> + + QList<ColorSchemeInterface*>* ColorSchemeInterface::ColorSchemeList = nullptr; + bool ColorSchemeInterface::Updated = false; +@@ -69,7 +70,7 @@ static bool lessThan(const ColorSchemeInterface* c1, + ColorSchemeInterface* ColorSchemeInterface::getColorScheme(const unsigned int index) + { + if(Updated) { +- qSort(ColorSchemeList->begin(), ColorSchemeList->end(), lessThan); ++ std::sort(ColorSchemeList->begin(), ColorSchemeList->end(), lessThan); + Updated = false; + } + return(ColorSchemeList->value(index, nullptr)); diff --git a/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc b/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc new file mode 100644 index 000000000000..83ab812ef80a --- /dev/null +++ b/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc @@ -0,0 +1,19 @@ +--- src/fractalalgorithminterface.cc.orig 2019-09-01 12:19:42 UTC ++++ src/fractalalgorithminterface.cc +@@ -23,6 +23,7 @@ + #include "fractalalgorithminterface.h" + #include "uintconfigentry.h" + ++#include <algorithm> + + QList<FractalAlgorithmInterface*>* FractalAlgorithmInterface::AlgorithmList = nullptr; + bool FractalAlgorithmInterface::Updated = false; +@@ -100,7 +101,7 @@ static bool lessThan(const FractalAlgorithmInterface* + FractalAlgorithmInterface* FractalAlgorithmInterface::getAlgorithm(const unsigned int index) + { + if(Updated) { +- qSort(AlgorithmList->begin(), AlgorithmList->end(), lessThan); ++ std::sort(AlgorithmList->begin(), AlgorithmList->end(), lessThan); + Updated = false; + } + return(AlgorithmList->value(index, nullptr)); |