Skip to content

Commit

Permalink
revert build with qt-5.15.15 to qt-5.15.2
Browse files Browse the repository at this point in the history
Cannot access to media audio using qt-5.15.15, so revert to 5.15.2.
  • Loading branch information
janbar committed Sep 22, 2024
1 parent 617ccf2 commit 3a227a4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 53 deletions.
45 changes: 0 additions & 45 deletions android/darwin-build-arm64-qt515.sh

This file was deleted.

4 changes: 2 additions & 2 deletions android/linux-build-arm64-qt515.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ BUILD_DIR=build-x64
rm -rf $BUILD_DIR/*
mkdir -p $BUILD_DIR

export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
export JAVA_HOME=$HOME/bin/java/jdk1.8.0
export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
export QT_DIR=$HOME/bin/Qt/5.15.15/android
export QT_DIR=$HOME/bin/Qt/5.15.2/android

cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
-DCMAKE_PREFIX_PATH=$QT_DIR \
Expand Down
4 changes: 2 additions & 2 deletions android/linux-build-armv7-qt515.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ BUILD_DIR=build-x64
rm -rf $BUILD_DIR/*
mkdir -p $BUILD_DIR

export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
export JAVA_HOME=$HOME/bin/java/jdk1.8.0
export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
export QT_DIR=$HOME/bin/Qt/5.15.15/android
export QT_DIR=$HOME/bin/Qt/5.15.2/android

cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
-DCMAKE_PREFIX_PATH=$QT_DIR \
Expand Down
4 changes: 2 additions & 2 deletions android/linux-build-x64-qt515.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ BUILD_DIR=build-x64
rm -rf $BUILD_DIR/*
mkdir -p $BUILD_DIR

export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
export JAVA_HOME=$HOME/bin/java/jdk1.8.0
export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
export QT_DIR=$HOME/bin/Qt/5.15.15/android
export QT_DIR=$HOME/bin/Qt/5.15.2/android

cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
-DCMAKE_PREFIX_PATH=$QT_DIR \
Expand Down
4 changes: 2 additions & 2 deletions android/linux-build-x86-qt515.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ BUILD_DIR=build-x86
rm -rf $BUILD_DIR/*
mkdir -p $BUILD_DIR

export JAVA_HOME=$HOME/bin/java/jdk-17.0.12
export JAVA_HOME=$HOME/bin/java/jdk1.8.0
export ANDROID_SDK_ROOT=$HOME/bin/android/sdk
export ANDROID_NDK=$HOME/bin/android/sdk/ndk/22.1.7171670
export QT_DIR=$HOME/bin/Qt/5.15.15/android
export QT_DIR=$HOME/bin/Qt/5.15.2/android

cmake .. -B $BUILD_DIR -DCMAKE_SYSTEM_NAME=Android \
-DCMAKE_PREFIX_PATH=$QT_DIR \
Expand Down

0 comments on commit 3a227a4

Please sign in to comment.