.gitlab-ci.yml | 8 ++++---- qt6/src/poppler-annotation.cc | 1 - qt6/tests/stress-threads-qt6.cpp | 16 ++++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-)
New commits: commit 78e6050a89d37a9d708eef92e15494d64d1a62c0 Author: Albert Astals Cid <[email protected]> Date: Sat Aug 29 12:07:50 2020 +0200 CI: Update qt6 archives diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94c9d8d7..baf8085e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,10 +38,10 @@ clang_format: build: stage: build script: - - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202006250811qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z - - 7z x 6.0.0-0-202006250811qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z - - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202006250811icu-linux-Rhel7.2-x64.7z - - 7z x 6.0.0-0-202006250811icu-linux-Rhel7.2-x64.7z + - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202008280953qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z + - 7z x 6.0.0-0-202008280953qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z + - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202008280953icu-linux-Rhel7.2-x64.7z + - 7z x 6.0.0-0-202008280953icu-linux-Rhel7.2-x64.7z - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data - mkdir -p build && cd build - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data .. -DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake commit a9fc7f0bcdcece62eda698016064a5f9e3acea24 Author: Albert Astals Cid <[email protected]> Date: Sat Aug 29 12:30:34 2020 +0200 qt6: workaround QTBUG-86318 diff --git a/qt6/tests/stress-threads-qt6.cpp b/qt6/tests/stress-threads-qt6.cpp index 162bb9e5..3803fd06 100644 --- a/qt6/tests/stress-threads-qt6.cpp +++ b/qt6/tests/stress-threads-qt6.cpp @@ -182,11 +182,13 @@ void CrazyThread::run() if (!annotations.isEmpty()) { qDebug() << "modify annotation..."; - annotations.at(QRandomGenerator::global()->bounded(annotations.size()))->setBoundary(QRectF(0.5, 0.5, 0.25, 0.25)); - annotations.at(QRandomGenerator::global()->bounded(annotations.size()))->setAuthor(QStringLiteral("foo")); - annotations.at(QRandomGenerator::global()->bounded(annotations.size()))->setContents(QStringLiteral("bar")); - annotations.at(QRandomGenerator::global()->bounded(annotations.size()))->setCreationDate(QDateTime::currentDateTime()); - annotations.at(QRandomGenerator::global()->bounded(annotations.size()))->setModificationDate(QDateTime::currentDateTime()); + // size is now a qsizetype which confuses bounded(), pretend we will never have that many annotations anyway + const quint32 annotationsSize = annotations.size(); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setBoundary(QRectF(0.5, 0.5, 0.25, 0.25)); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setAuthor(QStringLiteral("foo")); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setContents(QStringLiteral("bar")); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setCreationDate(QDateTime::currentDateTime()); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setModificationDate(QDateTime::currentDateTime()); } qDeleteAll(annotations); @@ -208,7 +210,9 @@ void CrazyThread::run() if (!annotations.isEmpty()) { qDebug() << "remove annotation..."; - page->removeAnnotation(annotations.takeAt(QRandomGenerator::global()->bounded(annotations.size()))); + // size is now a qsizetype which confuses bounded(), pretend we will never have that many annotations anyway + const quint32 annotationsSize = annotations.size(); + page->removeAnnotation(annotations.takeAt(QRandomGenerator::global()->bounded(annotationsSize))); } qDeleteAll(annotations); commit 418a9373616c14e67a1f9792d4039e62c3f8feb9 Author: Albert Astals Cid <[email protected]> Date: Sat Aug 29 12:12:41 2020 +0200 qt6: Remove unused include diff --git a/qt6/src/poppler-annotation.cc b/qt6/src/poppler-annotation.cc index f12a9181..627f70fd 100644 --- a/qt6/src/poppler-annotation.cc +++ b/qt6/src/poppler-annotation.cc @@ -30,7 +30,6 @@ */ // qt/kde includes -#include <QtCore/QRegExp> #include <QtCore/QtAlgorithms> #include <QtGui/QColor> #include <QtGui/QTransform> _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
