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

WIP: Analyze QTBUG-89616 #86

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

WIP: Analyze QTBUG-89616 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36fada8
Revert "qt: Fix Android build"
dg0yt Jan 8, 2021
24d76e2
ci: Disable everything but Android arm
dg0yt Jan 8, 2021
3c98c91
Report Android SDK info
dg0yt Jan 8, 2021
94aa079
qt: Build with ANDROID_API_VERSION android-28
dg0yt Jan 8, 2021
478f981
qt: WIP
dg0yt Jan 9, 2021
f3fc1b8
qt: WIP
dg0yt Jan 9, 2021
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
6 changes: 6 additions & 0 deletions ci/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:


- job: macOS
condition: False
timeoutInMinutes: 120
dependsOn: Source
variables:
Expand All @@ -60,6 +61,7 @@ jobs:


- job: Linux
condition: False
timeoutInMinutes: 120
dependsOn: macOS
variables:
Expand Down Expand Up @@ -158,6 +160,7 @@ jobs:
- template: publish.yml

- job: Android_x86
condition: False
timeoutInMinutes: 120
dependsOn: Android_x86_64
variables:
Expand Down Expand Up @@ -185,6 +188,7 @@ jobs:
- template: publish.yml

- job: Android_x86_64
condition: False
timeoutInMinutes: 120
dependsOn: Source
variables:
Expand Down Expand Up @@ -212,6 +216,7 @@ jobs:
- template: publish.yml

- job: Windows_mingw32
condition: False
timeoutInMinutes: 240
dependsOn: Source
variables:
Expand Down Expand Up @@ -244,6 +249,7 @@ jobs:
outputSuffix: -$(MINGW)

- job: Windows_mingw64
condition: False
timeoutInMinutes: 240
dependsOn: Source
variables:
Expand Down
3 changes: 3 additions & 0 deletions ci/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ steps:
-- ${{ parameters.buildArgs }}
displayName: 'Toolchain information'

- bash: ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list
displayName: 'SDK info'

- task: CMake@1
inputs:
workingDirectory: 'build'
Expand Down
11 changes: 8 additions & 3 deletions qt-5.12.10.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
set(short_version 5.12)
set(version 5.12.7)
set(patch_version ${version}-0)
set(openorienteering_version ${version}-qtbase-5.12.10-1)
set(openorienteering_version ${version}-qtbase-5.12.10-0)

option(USE_SYSTEM_QT "Use the system Qt if possible" ON)

Expand Down Expand Up @@ -102,15 +102,15 @@ superbuild_package(

SOURCE
URL https://github.com/OpenOrienteering/superbuild/archive/qt-${short_version}-openorienteering_${openorienteering_version}.tar.gz
URL_HASH SHA256=fc5031097b0c4750f59ba28f84df08c5e378499267681902ad1b3b32435b0162
URL_HASH SHA256=fa6bd764f42b32bdf3cea6999d26edb319f41cf1dba4995b062e31740076e5fe
)



# qtbase

set(qtbase_version 5.12.10)
set(qtbase_patch_version ${qtbase_version}-1)
set(qtbase_patch_version ${qtbase_version}-0)
superbuild_package(
NAME qtbase
VERSION ${short_version}
Expand Down Expand Up @@ -184,6 +184,7 @@ superbuild_package(
--unset=CXXFLAGS
--unset=LDFLAGS
$<@android@:
#ANDROID_API_VERSION=android-23
# Required to satisfy qconfigure.pri
PKG_CONFIG_SYSROOT_DIR=set-but-not-used
PKG_CONFIG_LIBDIR=set-but-not-used
Expand Down Expand Up @@ -261,6 +262,10 @@ superbuild_package(
>
-I "${CMAKE_STAGING_PREFIX}/include"
-L "${CMAKE_STAGING_PREFIX}/lib"
ANDROID_API_VERSION=android-24
BUILD_COMMAND
#$<@android@:"${CMAKE_COMMAND}" -E env ANDROID_API_VERSION=android-28>
"$(MAKE)"
INSTALL_COMMAND
"$(MAKE)" install INSTALL_ROOT=${DESTDIR}
$<@android@:
Expand Down