diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
commit | 94c576cf6607d3e9880fdaf6c8a51216bf2d2147 (patch) | |
tree | 32e42bdb8bcb869c894023f9494c2e2df310d585 /src/corelib/kernel/qjni.cpp | |
parent | 2ad7f6ddf5042d7442c97a89b083ca2853cf5721 (diff) | |
parent | e893e657e5c976f96e7e627ca90531934129bf4b (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I3bd83a839b16822035ed56a5cffe77bd6bc3f08d
Diffstat (limited to 'src/corelib/kernel/qjni.cpp')
-rw-r--r-- | src/corelib/kernel/qjni.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index 41d55c8fde..60154328c2 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -64,9 +64,7 @@ static QString qt_convertJString(jstring string) static inline bool exceptionCheckAndClear(JNIEnv *env) { if (Q_UNLIKELY(env->ExceptionCheck())) { -#ifdef QT_DEBUG env->ExceptionDescribe(); -#endif // QT_DEBUG env->ExceptionClear(); return true; } |