Skip to content
GitLab
Commit 83a481c4 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.12' into dev 

 Conflicts:
	.qmake.conf

Change-Id: Iffe069234ba9f2a29a8d25bda40e57e1923d0e06
parents ec731f55 478d964c
dev 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.2 wip/cmake v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2 v5.13.0-beta1 v5.13.0-alpha1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
src/androidextras/jni/qandroidjnienvironment.h
+ 1
− 1
View file @ 83a481c4
......@@ -47,7 +47,7 @@
QT_BEGIN_NAMESPACE
struct QJNIEnvironmentPrivate;
class QJNIEnvironmentPrivate;
class Q_ANDROIDEXTRAS_EXPORT QAndroidJniEnvironment
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment