Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the vendor_tools to the latest version. #2611

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Update the vendor_tools to the latest version. #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"common": [
{
"url": "${PAG_GROUP}/vendor_tools.git",
"commit": "b3125b9cf13bcc70e63212de1d0ed95e7beaa2a9",
"commit": "effcc0d22be03e55fab5c42ae82815ee7d76f74f",
"dir": "third_party/vendor_tools"
},
{
Expand Down
12 changes: 7 additions & 5 deletions qt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/rendering/sequences/SequenceInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class StaticSequenceGenerator : public tgfx::ImageGenerator {

#ifdef PAG_BUILD_FOR_WEB
bool asyncSupport() const override {
return true;
return false;
}
#endif

Expand Down Expand Up @@ -100,7 +100,7 @@ class SequenceFrameGenerator : public tgfx::ImageGenerator {

#ifdef PAG_BUILD_FOR_WEB
bool asyncSupport() const override {
return true;
return false;
}
#endif

Expand Down
Loading