Skip to content

Qt Bootstrap - Adapting to Qt 6.7 release #2990

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

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Qt Bootstrap - Adapting to Qt 6.7 release #2990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0faa8
Qt lib.xml - add placeholder for bundled_libs
ShyamQt Mar 11, 2024
2bc35d6
Qt Bootstrap: Set environment variables
ShyamQt Mar 11, 2024
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
29 changes: 20 additions & 9 deletions pythonforandroid/bootstraps/qt/build/src/main/java/org/kivy/android/PythonActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import android.content.pm.PackageManager;

import org.qtproject.qt.android.bindings.QtActivity;
import org.qtproject.qt.android.QtNative;

public class PythonActivity extends QtActivity {

Expand Down Expand Up @@ -52,6 +51,18 @@ public String getEntryPoint(String search_dir) {
return "main.py";
}

public void setEnvironmentVariable(String key, String value) {
/**
* Sets an environment variable based on key/value.
**/
try {
android.system.Os.setenv(key, value, true);
} catch (Exception e) {
Log.e("Qt bootstrap", "Unable set environment variable:" + key + "=" + value);
e.printStackTrace();
}
}

@Override
public void onCreate(Bundle savedInstanceState) {
this.mActivity = this;
Expand All @@ -69,14 +80,14 @@ public void onCreate(Bundle savedInstanceState) {
String entry_point = getEntryPoint(app_root_dir);

Log.v(TAG, "Setting env vars for start.c and Python to use");
QtNative.setEnvironmentVariable("ANDROID_ENTRYPOINT", entry_point);
QtNative.setEnvironmentVariable("ANDROID_ARGUMENT", app_root_dir);
QtNative.setEnvironmentVariable("ANDROID_APP_PATH", app_root_dir);
QtNative.setEnvironmentVariable("ANDROID_PRIVATE", mFilesDirectory);
QtNative.setEnvironmentVariable("ANDROID_UNPACK", app_root_dir);
QtNative.setEnvironmentVariable("PYTHONHOME", app_root_dir);
QtNative.setEnvironmentVariable("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
QtNative.setEnvironmentVariable("PYTHONOPTIMIZE", "2");
setEnvironmentVariable("ANDROID_ENTRYPOINT", entry_point);
setEnvironmentVariable("ANDROID_ARGUMENT", app_root_dir);
setEnvironmentVariable("ANDROID_APP_PATH", app_root_dir);
setEnvironmentVariable("ANDROID_PRIVATE", mFilesDirectory);
setEnvironmentVariable("ANDROID_UNPACK", app_root_dir);
setEnvironmentVariable("PYTHONHOME", app_root_dir);
setEnvironmentVariable("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
setEnvironmentVariable("PYTHONOPTIMIZE", "2");

Log.v(TAG, "About to do super onCreate");
super.onCreate(savedInstanceState);
Expand Down
8 changes: 8 additions & 0 deletions pythonforandroid/bootstraps/qt/build/templates/libs.tmpl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>

<!--
The bunlded_libs placeholder is needed for QtLoader.java. Otherwise the application will crash.
Adding extra libraries can be done through buildozer directly with android.add_libs_* option
-->
<array name="bundled_libs">
</array>

<array name="qt_libs">
<item>{{ arch }};c++_shared</item>
{%- for qt_lib in qt_libs %}
Expand Down