From 0293ea29918ecf1ddd69709e5dad629af59d7aa8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 14 Apr 2020 14:38:13 +0200 Subject: Update dependencies.yaml and adapt to API changes in qtbase The evaluation callback does not have to perform the comparison anymore and the shared pointer of the private is not used in the API anymore. Also, the versionFunctions() has been moved out of QOpenGLContext and renamed QOpenGLVersionFunctionsFactory::get(). QHash doesn't keep iterators stable under erase(), so clean up the code relying on it, and avoid an intermediate QList at the same time. Task-number: QTBUG-74409 Change-Id: I90176be1067d88c8f2b1ea07198a06d432f5be9c Reviewed-by: Eskil Abrahamsen Blomfeldt --- dependencies.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dependencies.yaml') diff --git a/dependencies.yaml b/dependencies.yaml index 034fe0cad6..166ab80fbc 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: b75c82f6456edbc00646da15531cfb63f8957817 + ref: a54294369d8bc7b98ed7d9d8ecf61774eec29782 required: true ../qtsvg: - ref: 44d35597f0c8924858326ae80853011f90a516b5 + ref: 210d8b9b0265c5c6486e7e30b0b89c7f98f47ff9 required: false -- cgit v1.2.3