diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:35:50 +0100 |
| commit | 83a481c4e2946fed7c072cdc971370cd2ac5591f (patch) | |
| tree | e8508268208a571f8ddc02e06a322bb345375c68 | |
| parent | ec731f559cbf875dfd758b5dcee123947eaad3a2 (diff) | |
| parent | 478d964cac7654d36ccfe5882dd09075bb85442d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Iffe069234ba9f2a29a8d25bda40e57e1923d0e06
| -rw-r--r-- | src/androidextras/jni/qandroidjnienvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/androidextras/jni/qandroidjnienvironment.h b/src/androidextras/jni/qandroidjnienvironment.h index 4edf8f4..46d443d 100644 --- a/src/androidextras/jni/qandroidjnienvironment.h +++ b/src/androidextras/jni/qandroidjnienvironment.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -struct QJNIEnvironmentPrivate; +class QJNIEnvironmentPrivate; class Q_ANDROIDEXTRAS_EXPORT QAndroidJniEnvironment { |