summaryrefslogtreecommitdiffstats
path: root/src/android
Commit message (Collapse)AuthorAgeFilesLines
* Android: Update the targetSdkVersion in the manifest to 28Christian Strømme2018-10-081-1/+1
| | | | | | Change-Id: I9fe8117ed75f82638b6a03166434bf83e23f166f Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Default to no style extraction on Android P when the target SDK is < 28Christian Strømme2018-10-082-5/+18
| | | | | | | | | | | | | | | | Applications with target SDK version lower then 28 running on a device with version greater or equal to 28 will cause compatibility warnings, so default to none when the extract_android_style value is set to default. Note that the new value "default" was introduced to allow this kind of changes in the future, i.e., selecting the best solution based on some simple heuristics. Adding a new value also keep compatibility and allows the user to explicitly set a value when needed. Task-number: QTBUG-69810 Change-Id: I68301716767870ce6de40e45742d9c5fc263ee25 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: bump android gradle plugin versionv5.12.0-beta1BogDan Vatra2018-10-021-1/+1
| | | | | | | | Needed to fix "No toolchains found in the NDK toolchains folder for ABI with prefix: mips64el-linux-android" Change-Id: I62d9bae0bf424bb9ba32adce98426245922a841b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: Support mouse hoverMichael Dippold2018-07-131-18/+33
| | | | | | | | | Android supports hover events through the generic motion event. Routed mouse events to specific mouse handler. Task-number: QTBUG-42799 Change-Id: Iee17c71c09d84f52235e66ec08c65ffa30ec9cd9 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-292-0/+2
|\ | | | | | | Change-Id: I8d8b03ea46c537b091b72dc7b68aa6aa3a627ba6
| * Add translation for unsupported_android_version for fr and deSamuel Gaist2018-05-252-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | More recent versions of Android lint triggers an error when a translation is missing. The solution is to either provide translations for all languages supported or add translatable="false" as property to the strings that are not yet fully translated. Task-number: QTBUG-63952 Change-Id: I5afa8a23d3e2285b5c93ee493d9b02397c328f2d Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-05-241-5/+10
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt_common.prf src/corelib/tools/qstring.cpp src/plugins/platforms/windows/qwindowsmousehandler.cpp src/widgets/widgets/qmainwindowlayout_p.h Change-Id: I5df613008f6336f69b257d08e49a133d033a9d65
| * Fix Android loaderThiago Marcos P. Santos2018-05-141-5/+10
| | | | | | | | | | | | | | | | | | Invalid syntax due to missing closing brackets and exception not being handled when calling .close() on a stream. Change-Id: If8f191fbc44fe1b031fd86abff5163bca434156a Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Remove old debugging hackBogDan Vatra2018-05-151-231/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with QtCreator 4.6.1* we introduce a new way to debug Qt on Android apps, which doesn't need this support anymore. Of course to debug Qt 5.12+ the user must use QtCreator 4.6.1+ * 429c596395697ff3533e679a848ad26cd1ee97cb [ChangeLog][Android] Remove old debugging way. To be able to debug Qt on Android apps the user must use QtCreator 4.6.1+ Change-Id: I16d08312628c9afb7cfa47eb906b25a87af5ba55 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-051-15/+43
|\| | | | | | | Change-Id: Ib58433da04bffb5dfab5486b80f17f39cc4145fa
| * Avoid to fail to close stream on exceptionAndré Klitzing2018-05-041-15/+43
| | | | | | | | | | | | | | | | Move .close() to finally block. Found by spotbugs. Change-Id: I1d11f52c79e805082f05801e4ef0ec94c6dc4e6e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Android: rewrite edit context menuBogDan Vatra2018-04-157-210/+201
| | | | | | | | | | | | | | | | | | | | | | | | - get rid of the old tool bar with edit controls which was also dropped by Google after they realized that is not intuitive at all. - we now introduce a nice context menu as we see in modern Android devices. This menu works on all Android devices starting with API 16. [ChangeLog][Android] Say hello to Android edit context menu Change-Id: I00d0d83fe8876335c72d7b183db4c1b53746d6b7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Update gradle filesBogDan Vatra2018-03-231-5/+5
| | | | | | | | | | Change-Id: I7324082ef9eb19cb0851a0a53e8e41ee8f174210 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Refactor cursor & selection handlesBogDan Vatra2018-03-141-53/+69
| | | | | | | | | | | | | | | | | | - turn CursorHandleShowMode in a QFlag for better control - add ScopedValueChangeBack which is useful to control m_blockUpdateSelection - implement longPress word selection Change-Id: Ieed709644db991e10077d5be5d5a59f16f4fc3a8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-052-2/+1
|\| | | | | | | Change-Id: Ifce6ddeb4dab8c672732ec6aa6c19a6c4bce447e
| * Remove unused variableAndré Klitzing2018-03-051-1/+0
| | | | | | | | | | | | | | Found by spotbugs. Change-Id: I0aa81e45ced0a995adb5e4a45be925e5ef219a77 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Avoid infinite recursive loopAndré Klitzing2018-03-031-1/+1
| | | | | | | | | | | | | | | | Looks like this should be "super." instead of "super_" Found by spotbugs. Change-Id: I83d096eee332361d62e783581bfa15017536081d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Android: Don't kill app when SIM card or density changesEskil Abrahamsen Blomfeldt2018-03-051-1/+1
|/ | | | | | | | | | | | | | | | | This adds subscription to additional config changes on Android to avoid the application automatically restarting when the SIM card is replaced or the logical density of the screen is changed (as a result of the user changing it in settings). These restarts are especially problematic when using Qt in a home screen application due to the way they are launched. [ChangeLog][Android] Avoid the system restarting application when user replaces SIM card or changes the logical density of the screen. Task-number: QTBUG-63735 Change-Id: Iba85fe6239b2d29b543b3c4e2f953efb9b54f713 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Android: Close the DataOutputStream when we are finished with itAndy Shaw2018-03-021-1/+7
| | | | | | Task-number: QTBUG-66769 Change-Id: I93c49baa0ccab4f853402d9be675af1c50b2e0c1 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-141-10/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
| * Don't update the position if the handle was not first pressedBogDan Vatra2018-01-271-0/+5
| | | | | | | | | | Change-Id: If09a2ca954a3bfca00b5a0839fea2899e7576c1d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Move selection handles 1mm downBogDan Vatra2018-01-271-10/+12
| | | | | | | | | | | | | | | | This way the user will not cover with his finger the text with the cursor/selection. Set the tolerance to 0.5mm which is less then the width of the thinnest letters (e.g. i, I, l) Change-Id: Ia5d50bd3f4fe79c89d01b3d7f5e5c22e94e8158b Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Load Qt libs from Qt threadBogDan Vatra2018-02-116-58/+203
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Android] The application and dependent Qt libraries are now loaded on the same thread as main() is run on, ensuring that global static initializers, constructor functions, and main() are all run on the same thread. The same applies during application shutdown, for destructors of global objects, and destructor functions. Change-Id: Id4bfece1ed2a0532ed2e8fb7d8ffd6e55d5a10dc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLars Knoll2018-01-024-6/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-12-301-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
| | * Android: Support caps lockMichael Dippold2017-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | MetaKeyKeyListener augments the meta state of the keyboard, we need to also check the KeyEvent.getMetaState(). Task-number: QTBUG-61369 Change-Id: I07a5d7b1b741a958bc94e1f1677dc1f2256220b6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-1/+2
| |\ \ | | | | | | | | | | | | Change-Id: I6dcf85067ec226136c207ea69ca9d66736c84db5
| | * | Android: use a canonical data dir for Qt environment variablesv5.10.0-rc3v5.10.0J-P Nurmi2017-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationInfo.dataDir holds "/data/user/0" (Blackberry PRIV running Android 6.0.1), which is in fact a soft link to "/data/data". This directory is used as a prefix for various Qt environment variables, including QML2_IMPORT_PATH, which in turn is used for resolving QML type URIs, looking up Qt Quick Controls 2 styles, and so on. The QML engine is not happy with "/data/data" and "/data/user/0" being wildly mixed for QML types in the same module. Use the canonical path instead to avoid such conflicts. Change-Id: I1fd45736728ee662942d7ef48c3fbc553981c59b Task-number: QTBUG-64868 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0Liang Qi2017-11-211-148/+153
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I3224e0b877ec24b587e299083feb793518b0568c
| * | \ \ Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-052-4/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
| | * | | Android: fix scrolling using a touch keyboard on BlackberryJ-P Nurmi2017-11-282-4/+4
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up commit to 97eec16e. Blackberry tries sending touchpad events first, and if not consumed, it sends synthetic mouse wheel events as a fallback. This makes touch keyboard scrolling work in native Android ListViews and other views that do not handle SOURCE_TOUCHPAD motion events. Qt apps, however, blindly accepted all generic motion events, so synthesized mouse wheel events were never sent. => Make QtSurface & QtNative accept only those motions events that are actually handled. Task-number: QTBUG-51165 Change-Id: Iefbbf1e3e1cc3da86afc4c87c19671cc6c5fa145 Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-301-148/+153
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-281-148/+153
| |\| | | | |/ | |/| | | | Change-Id: Iede384644c3df5ee01b701806dfdb586dd6bb138
| | * No debugging and extra env & params processing on sealed packagesv5.9.3BogDan Vatra2017-11-161-148/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A "sealed" package is a *release build and signed* Qt for Android package with no debugging capabilities. By default sealed packages have no debugging capabilities, but the user can force debugging capabilities also on a sealed package. This is useful in corner cases when the user really needs to debug a sealed package. Change-Id: I840526092556067f2659facf1525861bbabe0edd Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Android: remove support for local/debug deploymentJake Petroules2017-09-064-33/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: I3fa6819259be365b7a697f7db1d1d01a94032395 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Forward Service.onBind notification to QtBogDan Vatra2017-07-042-1/+15
| | | | | | | | | | | | | | It is needed to implement Android Binder in Qt. Change-Id: I8f6f8ef778f97a444a1b16d6f62e211e188b65cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Android: Allow deploying Qt apps as system appsAnton Miller2017-06-284-25/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main app shared library and shared dependencies are not automatically deployed when the apk is placed in /system/app or /system/priv-app. In such cases, we need to place these libraries in /system/lib and tell QtLoader to load them from here. It is possible to specify a custom library path in AndroidManifest.xml. [ChangeLog][Android][QtLoader] Enabled loading shared libraries from /system/lib or a custom path specified with the android.app.system_libs_prefix metadata variable in AndroidManifest.xml. This allows deploying Qt apps as Android system apps. Change-Id: I8388e91a53475b06a027467face45c08f096fbf8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-194-11/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
| * Android: fix missing wheel eventsJ-P Nurmi2017-06-182-0/+20
| | | | | | | | | | | | Change-Id: I65b4f6a8fcbdad537a984064e332a4a1f34a265a Task-number: QTBUG-43669 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Android: Fix RTL selection handles directionsBogDan Vatra2017-06-133-11/+22
| | | | | | | | | | | | | | | | Invert the selection handles icons when the selected text is rtl. Task-number: QTBUG-61073 Change-Id: I8339a14d1e4d9e79d218516daf3ac783911f6026 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-073-46/+29
|\| | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreply.cpp tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
| * QClipboard: make dataChanged() signal work on AndroidOleg Yadrov2017-05-041-2/+14
| | | | | | | | | | | | | | | | | | | | | | This part has not been implemented before. Also replace deprecated android.text.ClipboardManager with modern android.content.ClipboardManager. Task-number: QTBUG-58548 Change-Id: I190208042af8a6c87ed391c6c72f3f51e58dfad3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix different look when running the application second timeBogDan Vatra2017-05-031-2/+4
| | | | | | | | | | | | | | | | The problem was introduced in Qt 5.7. Task-number: QTBUG-60297 Change-Id: I46265b24e104e08fe5b8026e5441514a438582c9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Use gdbserver command from a safe placeBogDan Vatra2017-04-251-42/+11
| | | | | | | | | | | | | | | | Removed support for old QtCreator versions (pre 3.5) Change-Id: I5ec0e965c09c8a76810144b133af3395e32fddfa Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-121-1/+1
| |\ | | | | | | | | | Change-Id: I3bd83a839b16822035ed56a5cffe77bd6bc3f08d
| | * Use latest stable version of the android:gradle pluginBogDan Vatra2017-04-111-1/+1
| | | | | | | | | | | | | | | Change-Id: I15418015c6a206dd1a8e4b52894ec83ddaeb9fc2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-042-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-282-1/+2
| |\| | | | | | | | | | Change-Id: I4788bc037c55c48563ffd4ba9633a22aa1d12f22
| | * Make sure we quit qt when the service is destroyedBogDan Vatra2017-03-272-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-58471 Change-Id: I37f162717f57323136811a8f80d53e3c3b7d6f22 Reviewed-by: Christian Stromme <christian.stromme@qt.io>