diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:04:15 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:04:15 +0200 |
commit | d74c53914f0a8406d3f0f52fd37bedf6d022e554 (patch) | |
tree | f63f09ece485c3ebfc7895cc964d9b2389207b69 /src/androidextras/jni/qandroidjnienvironment.cpp | |
parent | 4d50233b038738f4799d903132afc683f170e7f2 (diff) | |
parent | a943ae881a897f0bacfdda94725a2bfd6028766e (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iaf6d347954107fb26b179b7d3cb2662b3df504db
Diffstat (limited to 'src/androidextras/jni/qandroidjnienvironment.cpp')
-rw-r--r-- | src/androidextras/jni/qandroidjnienvironment.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/androidextras/jni/qandroidjnienvironment.cpp b/src/androidextras/jni/qandroidjnienvironment.cpp index ddb3f4e..10bf229 100644 --- a/src/androidextras/jni/qandroidjnienvironment.cpp +++ b/src/androidextras/jni/qandroidjnienvironment.cpp @@ -154,6 +154,7 @@ static void clearException(bool silent) /*! \class QAndroidJniExceptionCleaner \inmodule QtAndroidExtras + \brief Cleans pending JNI exceptions. The QAndroidJniExceptionCleaner is a convenience class useful to clean the pending JNI exceptions from the current scope. |