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] support for android #27421

Merged
merged 18 commits into from
Nov 2, 2022
Merged

[qtbase] support for android #27421

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
29be953
[qtbase] support for android
m-kuhn Oct 23, 2022
1108003
Fix opengl on android
m-kuhn Oct 24, 2022
a45973a
Make gles a feature
m-kuhn Oct 24, 2022
d36f611
Adjust android dependencies
m-kuhn Oct 24, 2022
13fc829
v.db
m-kuhn Oct 24, 2022
db99166
Make ANDROID_SDK_ROOT available to all qt* ports
m-kuhn Oct 24, 2022
b1381c1
v db
m-kuhn Oct 24, 2022
6101604
naming and feature
m-kuhn Oct 24, 2022
776d30f
v db
m-kuhn Oct 24, 2022
bedebe1
Gate gles2 `!windows`
m-kuhn Oct 27, 2022
89898a0
v db
m-kuhn Oct 27, 2022
21fe4ec
!linux
m-kuhn Oct 27, 2022
703fbc4
v db
m-kuhn Oct 27, 2022
8d3d90f
add qtbase[gles2] to ci for linux
m-kuhn Oct 28, 2022
7c865ff
v db
m-kuhn Oct 28, 2022
87dd083
disable opengl_desktop if gles2 is set
m-kuhn Oct 28, 2022
c597a20
disable gles3
m-kuhn Oct 28, 2022
7d6c17e
v db
m-kuhn Oct 28, 2022
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
5 changes: 5 additions & 0 deletions ports/qtbase/cmake/qt_install_submodule.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ if(NOT DEFINED QT6_DIRECTORY_PREFIX)
set(QT6_DIRECTORY_PREFIX "Qt6/")
endif()

if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT)
message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." )
endif()

function(qt_download_submodule_impl)
cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES")

Expand Down Expand Up @@ -123,6 +127,7 @@ function(qt_cmake_configure)
-DINSTALL_LIBEXECDIR:STRING=bin
-DINSTALL_PLUGINSDIR:STRING=${qt_plugindir}
-DINSTALL_QMLDIR:STRING=${qt_qmldir}
-DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
${_qarg_OPTIONS}
OPTIONS_RELEASE
${_qarg_OPTIONS_RELEASE}
Expand Down
2 changes: 1 addition & 1 deletion ports/qtbase/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
INVERTED_FEATURES
"vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan
"egl" CMAKE_DISABLE_FIND_PACKAGE_EGL
"gles" CMAKE_DISABLE_FIND_PACKAGE_GLESv2
m-kuhn marked this conversation as resolved.
Show resolved Hide resolved
"fontconfig" CMAKE_DISABLE_FIND_PACKAGE_Fontconfig
#"freetype" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated
"harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz
Expand Down Expand Up @@ -193,7 +194,6 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON)
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GLESv2:BOOL=ON) # only used if INPUT_opengl is correctly set
list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON)
# sql-drivers features:

Expand Down
14 changes: 13 additions & 1 deletion ports/qtbase/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.3.2",
"port-version": 1,
"port-version": 2,
"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,
Expand Down Expand Up @@ -121,6 +121,15 @@
"xrender"
],
"platform": "linux"
},
{
"name": "qtbase",
"default-features": false,
"features": [
"egl",
"gles"
],
"platform": "android"
}
]
},
Expand Down Expand Up @@ -162,6 +171,9 @@
}
]
},
"gles": {
"description": "GLES"
m-kuhn marked this conversation as resolved.
Show resolved Hide resolved
},
"glib": {
"description": "GLib",
"dependencies": [
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 @@ -6210,7 +6210,7 @@
},
"qtbase": {
"baseline": "6.3.2",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.3.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": "10513a054c0735740c8dec4b46944d0e306036cf",
"version": "6.3.2",
"port-version": 2
},
{
"git-tree": "02656542bbdef8469f5a461b1523c4111f0841b3",
"version": "6.3.2",
Expand Down