diff --git a/DEPS b/DEPS index 998b98e785..2c60c7d4e5 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ "common": [ { "url": "${PAG_GROUP}/vendor_tools.git", - "commit": "b3125b9cf13bcc70e63212de1d0ed95e7beaa2a9", + "commit": "effcc0d22be03e55fab5c42ae82815ee7d76f74f", "dir": "third_party/vendor_tools" }, { diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 3a975e5383..bc21659b6f 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -36,13 +36,15 @@ if (NOT CMAKE_PREFIX_PATH) include("./QTCMAKE.cfg") endif () -find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) -if (${QT_VERSION_MAJOR} LESS 6) - message("The QT version is less than 6.0, force to use x86_64 architecture.") - SET(CMAKE_SYSTEM_PROCESSOR x86_64) - SET(CMAKE_OSX_ARCHITECTURES x86_64) +string(REGEX MATCH "([0-9]+)\\.[0-9]+\\.[0-9]+" QT_VERSION ${CMAKE_PREFIX_PATH}) +if (QT_VERSION) + string(REGEX MATCH "^[0-9]+" QT_VERSION_MAJOR ${QT_VERSION}) + if (QT_VERSION_MAJOR GREATER_EQUAL 6 AND CMAKE_SIZEOF_VOID_P EQUAL 4) + message(FATAL_ERROR "QT has dropped support for 32-bit builds since version 6.0.0") + endif () endif () +find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets OpenGL Qml Quick) list(APPEND PAG_VIEWER_PLATFORM_LIBS Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::Qml Qt${QT_VERSION_MAJOR}::Quick) diff --git a/src/rendering/sequences/SequenceInfo.h b/src/rendering/sequences/SequenceInfo.h index f25ef624e7..e124f01fa2 100644 --- a/src/rendering/sequences/SequenceInfo.h +++ b/src/rendering/sequences/SequenceInfo.h @@ -71,7 +71,7 @@ class StaticSequenceGenerator : public tgfx::ImageGenerator { #ifdef PAG_BUILD_FOR_WEB bool asyncSupport() const override { - return true; + return false; } #endif @@ -100,7 +100,7 @@ class SequenceFrameGenerator : public tgfx::ImageGenerator { #ifdef PAG_BUILD_FOR_WEB bool asyncSupport() const override { - return true; + return false; } #endif