Skip to content

Commit dab984c

Browse files
committed
Добавлены шаблоны для Android. Ориентация теперь задана, как строго
портретная. Теперь окно контекстного меню открывается корректно.
1 parent e4cac41 commit dab984c

File tree

12 files changed

+538
-17
lines changed

12 files changed

+538
-17
lines changed

Lab.pro

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
1616
SOURCES += \
1717
main.cpp
1818

19-
RESOURCES += qml2.qrc
19+
RESOURCES += qml.qrc
2020

2121
TRANSLATIONS += \
2222
Lab_ru_RU.ts
@@ -31,3 +31,16 @@ QML_DESIGNER_IMPORT_PATH =
3131
qnx: target.path = /tmp/$${TARGET}/bin
3232
else: unix:!android: target.path = /opt/$${TARGET}/bin
3333
!isEmpty(target.path): INSTALLS += target
34+
35+
ANDROID_ABIS = armeabi-v7a
36+
37+
DISTFILES += \
38+
android/AndroidManifest.xml \
39+
android/build.gradle \
40+
android/gradle/wrapper/gradle-wrapper.jar \
41+
android/gradle/wrapper/gradle-wrapper.properties \
42+
android/gradlew \
43+
android/gradlew.bat \
44+
android/res/values/libs.xml
45+
46+
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

android/AndroidManifest.xml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
<?xml version="1.0"?>
2+
<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
3+
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
4+
Remove the comment if you do not require these default permissions. -->
5+
<!-- %%INSERT_PERMISSIONS -->
6+
7+
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
8+
Remove the comment if you do not require these default features. -->
9+
<!-- %%INSERT_FEATURES -->
10+
11+
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
12+
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true">
13+
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="portrait" android:launchMode="singleTop">
14+
<intent-filter>
15+
<action android:name="android.intent.action.MAIN"/>
16+
<category android:name="android.intent.category.LAUNCHER"/>
17+
</intent-filter>
18+
19+
<!-- Application arguments -->
20+
<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
21+
<!-- Application arguments -->
22+
23+
<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
24+
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
25+
<meta-data android:name="android.app.repository" android:value="default"/>
26+
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
27+
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
28+
<!-- Deploy Qt libs as part of package -->
29+
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
30+
31+
<!-- Run with local libs -->
32+
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
33+
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
34+
<meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
35+
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
36+
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
37+
<!-- Used to specify custom system library path to run with local system libs -->
38+
<!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
39+
<!-- Messages maps -->
40+
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
41+
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
42+
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
43+
<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
44+
<!-- Messages maps -->
45+
46+
<!-- Splash screen -->
47+
<!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
48+
then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
49+
use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
50+
are done populating your window with content. -->
51+
<!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
52+
<!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
53+
<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
54+
<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
55+
<!-- Splash screen -->
56+
57+
<!-- Background running -->
58+
<!-- Warning: changing this value to true may cause unexpected crashes if the
59+
application still try to draw after
60+
"applicationStateChanged(Qt::ApplicationSuspended)"
61+
signal is sent! -->
62+
<meta-data android:name="android.app.background_running" android:value="false"/>
63+
<!-- Background running -->
64+
65+
<!-- auto screen scale factor -->
66+
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
67+
<!-- auto screen scale factor -->
68+
69+
<!-- extract android style -->
70+
<!-- available android:values :
71+
* default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
72+
* full - useful QWidget & Quick Controls 1 apps
73+
* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
74+
* none - useful for apps that don't use any of the above Qt modules
75+
-->
76+
<meta-data android:name="android.app.extract_android_style" android:value="default"/>
77+
<!-- extract android style -->
78+
</activity>
79+
80+
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
81+
82+
</application>
83+
84+
</manifest>

android/build.gradle

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
buildscript {
2+
repositories {
3+
google()
4+
jcenter()
5+
}
6+
7+
dependencies {
8+
classpath 'com.android.tools.build:gradle:3.6.0'
9+
}
10+
}
11+
12+
repositories {
13+
google()
14+
jcenter()
15+
}
16+
17+
apply plugin: 'com.android.application'
18+
19+
dependencies {
20+
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
21+
}
22+
23+
android {
24+
/*******************************************************
25+
* The following variables:
26+
* - androidBuildToolsVersion,
27+
* - androidCompileSdkVersion
28+
* - qt5AndroidDir - holds the path to qt android files
29+
* needed to build any Qt application
30+
* on Android.
31+
*
32+
* are defined in gradle.properties file. This file is
33+
* updated by QtCreator and androiddeployqt tools.
34+
* Changing them manually might break the compilation!
35+
*******************************************************/
36+
37+
compileSdkVersion androidCompileSdkVersion.toInteger()
38+
39+
buildToolsVersion '28.0.3'
40+
41+
sourceSets {
42+
main {
43+
manifest.srcFile 'AndroidManifest.xml'
44+
java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
45+
aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
46+
res.srcDirs = [qt5AndroidDir + '/res', 'res']
47+
resources.srcDirs = ['resources']
48+
renderscript.srcDirs = ['src']
49+
assets.srcDirs = ['assets']
50+
jniLibs.srcDirs = ['libs']
51+
}
52+
}
53+
54+
lintOptions {
55+
abortOnError false
56+
}
57+
58+
// Do not compress Qt binary resources file
59+
aaptOptions {
60+
noCompress 'rcc'
61+
}
62+
63+
defaultConfig {
64+
resConfig "en"
65+
minSdkVersion = qtMinSdkVersion
66+
targetSdkVersion = qtTargetSdkVersion
67+
}
68+
}
53.1 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

android/gradlew

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
#!/usr/bin/env sh
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
26+
27+
APP_NAME="Gradle"
28+
APP_BASE_NAME=`basename "$0"`
29+
30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
33+
# Use the maximum available, or set MAX_FD != -1 to use that value.
34+
MAX_FD="maximum"
35+
36+
warn () {
37+
echo "$*"
38+
}
39+
40+
die () {
41+
echo
42+
echo "$*"
43+
echo
44+
exit 1
45+
}
46+
47+
# OS specific support (must be 'true' or 'false').
48+
cygwin=false
49+
msys=false
50+
darwin=false
51+
nonstop=false
52+
case "`uname`" in
53+
CYGWIN* )
54+
cygwin=true
55+
;;
56+
Darwin* )
57+
darwin=true
58+
;;
59+
MINGW* )
60+
msys=true
61+
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
65+
esac
66+
67+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68+
69+
# Determine the Java command to use to start the JVM.
70+
if [ -n "$JAVA_HOME" ] ; then
71+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72+
# IBM's JDK on AIX uses strange locations for the executables
73+
JAVACMD="$JAVA_HOME/jre/sh/java"
74+
else
75+
JAVACMD="$JAVA_HOME/bin/java"
76+
fi
77+
if [ ! -x "$JAVACMD" ] ; then
78+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79+
80+
Please set the JAVA_HOME variable in your environment to match the
81+
location of your Java installation."
82+
fi
83+
else
84+
JAVACMD="java"
85+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86+
87+
Please set the JAVA_HOME variable in your environment to match the
88+
location of your Java installation."
89+
fi
90+
91+
# Increase the maximum file descriptors if we can.
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93+
MAX_FD_LIMIT=`ulimit -H -n`
94+
if [ $? -eq 0 ] ; then
95+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96+
MAX_FD="$MAX_FD_LIMIT"
97+
fi
98+
ulimit -n $MAX_FD
99+
if [ $? -ne 0 ] ; then
100+
warn "Could not set maximum file descriptor limit: $MAX_FD"
101+
fi
102+
else
103+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104+
fi
105+
fi
106+
107+
# For Darwin, add options to specify how the application appears in the dock
108+
if $darwin; then
109+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110+
fi
111+
112+
# For Cygwin, switch paths to Windows format before running java
113+
if $cygwin ; then
114+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116+
JAVACMD=`cygpath --unix "$JAVACMD"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
171+
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)