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

Jump to bottom

[qtbase] ios support #29220

Closed
wants to merge 1 commit into from
Closed

[qtbase] ios support #29220

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
22 changes: 22 additions & 0 deletions ports/qtbase/fix_glminmax_ios.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd better to push this changes to the upstream first / later.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, this is tricky enough I would like to see that it has been at least submitted upstream before merging this.

/cc @Neumann-A

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point. I was speculating for someone here already with content knowledge.

index 89c5d75f..41e3783e 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -2446,10 +2446,17 @@ static inline GLenum toGlBlendOp(QRhiGraphicsPipeline::BlendOp op)
return GL_FUNC_SUBTRACT;
case QRhiGraphicsPipeline::ReverseSubtract:
return GL_FUNC_REVERSE_SUBTRACT;
+#if defined(Q_OS_IOS)
+ case QRhiGraphicsPipeline::Min:
+ return GL_MIN_EXT;
+ case QRhiGraphicsPipeline::Max:
+ return GL_MAX_EXT;
+#else
case QRhiGraphicsPipeline::Min:
return GL_MIN;
case QRhiGraphicsPipeline::Max:
return GL_MAX;
+#endif
default:
Q_UNREACHABLE();
return GL_FUNC_ADD;
1 change: 1 addition & 0 deletions ports/qtbase/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ set(${PORT}_PATCHES
clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not.
installed_dir.patch
GLIB2-static.patch # alternative is to force pkg-config
fix_glminmax_ios.patch
)

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
Expand Down
11 changes: 10 additions & 1 deletion ports/qtbase/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"name": "qtbase",
"version": "6.4.2",
"port-version": 1,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,
"supports": "!uwp",
"dependencies": [
{
"name": "libb2",
"platform": "!windows"
"platform": "!windows & !ios"
},
"pcre2",
{
Expand Down Expand Up @@ -108,6 +109,14 @@
"default-features": {
"description": "Platform-dependent default features",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"gles2"
],
"platform": "ios"
},
{
"name": "qtbase",
"default-features": false,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6378,7 +6378,7 @@
},
"qtbase": {
"baseline": "6.4.2",
"port-version": 0
"port-version": 1
},
"qtcharts": {
"baseline": "6.4.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55cc489b4d31baaeb3a3e6740d9275dc73904a96",
"version": "6.4.2",
"port-version": 1
},
{
"git-tree": "a4c5fd7ea860b1c35266670b5efe76b65d5ba8f6",
"version": "6.4.2",
Expand Down