diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-30 08:28:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-30 09:16:58 +0100 |
| commit | 87204c856ae3d8495c41af998ac196a12fe1c779 (patch) | |
| tree | 5af64eaa3acde506d19fe4ab1c88b028a2197adf /src/plugins/platforms/android | |
| parent | 498ef7f9d77fca75bcba2f657aaac38c8dc78aea (diff) | |
| parent | d0812cbdabcff4d388334c499c23992cce98d4da (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/thread/qsemaphore.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707
Diffstat (limited to 'src/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/androidjniclipboard.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjniclipboard.cpp b/src/plugins/platforms/android/androidjniclipboard.cpp index 833996403c..d169035339 100644 --- a/src/plugins/platforms/android/androidjniclipboard.cpp +++ b/src/plugins/platforms/android/androidjniclipboard.cpp @@ -47,7 +47,6 @@ namespace QtAndroidClipboard { QAndroidPlatformClipboard *m_manager = nullptr; - static char const *const QtNativeClassName = "org/qtproject/qt5/android/QtNative"; static JNINativeMethod methods[] = { {"onClipboardDataChanged", "()V", (void *)onClipboardDataChanged} }; |