summaryrefslogtreecommitdiffstats
path: root/src/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-062-13/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
| * Android: Start the application when we know the screen geometry.BogDan Vatra2015-07-302-13/+25
| | | | | | | | | | | | | | | | | | Until now we'se set the screenGemetry to 0,0 until the layout is created, but some controls needs it before that. Task-number: QTBUG-44271 Change-Id: I7d00e2a142572e27fc77e46566bb2cdb37f58035 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-07-014-24/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
| * Android: Delay initialization of Accessibility.Christian Strømme2015-06-093-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | The accessibility class was created and activated in onCreate(), which meant we where trying to activate accessibility before the platform plugin was properly initialized. With this change we will also activate, or deactivate, accessibility in Qt whenever the state is changed by Android, compared to doing it at start-up only. Task-number: QTBUG-46355 Change-Id: I5cbae125df43f7694d4464d5054e6cfec4626e26 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * Android: Fix resuming app after locale changeEskil Abrahamsen Blomfeldt2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default reaction to configuration changes in Android is to destroy the activity. To avoid this happening for locale changes, we had the "locale" configuration change registered in the default AndroidManifest.xml, however, you also need to register that you are handling the layoutDirection change, otherwise Android will not call onConfigurationChange() for language changes, but tear down the activity instead. [ChangeLog][Android] Fixed bug where application was not resumable after user changed language in system settings. Change-Id: I3fe84a9332217b062b5352b2c977e2dbeacd5239 Task-number: QTBUG-45430 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-034-30/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| * Revert "Android: Don't show translucent system UI on top of Qt"Eskil Abrahamsen Blomfeldt2015-05-302-28/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9aaa3e2cde5ffe5edaa4f17f84020d82609b7e9. This fix broke fullscreen mode on Android. A better solution is in the works, but we'll probably push that to Qt 5.5.1 instead since it comes with a risk and we don't want to delay the release any further. Change-Id: I3aae6d52ebb8425089cdb6f7fc4c8ce9ad4911df Task-number: QTBUG-38700 Task-number: QTBUG-46234 Reviewed-by: BogDan Vatra <bogdan@kde.org>
| * Merge remote-tracking branch 'origin/5.4' into merge5.5Allan Sandfeld Jensen2015-05-082-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/io/qnoncontiguousbytedevice_p.h src/gui/image/qjpeghandler.cpp src/network/access/qhttpthreaddelegate_p.h tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp tests/auto/widgets/widgets/qmenubar/BLACKLIST Change-Id: I01de8c1c28efcedfd7953d05025f54802dc08ab3
| | * Android: Fix wrong field name in ExtractStyle.javaChristian Strømme2015-04-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | In Android 5.1 the field name for the inset state member in InsetDrawable changed from mInsetState to mState. Task-number: QTBUG-45714 Change-Id: I0ebada1ef90954013e5357cbd10df925f8f05295 Reviewed-by: BogDan Vatra <bogdan@kde.org>
| | * Android: Use Holo theme on Android 5.1Christian Strømme2015-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We already fallback to the Holo theme on Android 5.0 devices, see: 7c539579b9e883c87e5f7fb3bbec80847fc83ae2 Task-number: QTBUG-45714 Change-Id: I18b0700321b27ab5bbe3f1642a0bc9de1774864a Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | | Android: generate QTabletEvents for stylus devices such as the S PenShawn Rutledge2015-05-211-21/+43
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example the Galaxy Note series of devices. This makes possible drawing applications which handle stylus events differently from touch or mouse. As on any other platform, if the application does not accept the QTabletEvent, a QMouseEvent will be synthesized. Also fix the tablet manual test to show larger circles on hidpi devices. [ChangeLog][Android] stylus devices such as the S Pen generate QTabletEvents Task-number: QTBUG-38379 Change-Id: Ib594f453b8403cc06aa4e440a76f07afa3bac38c Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Pass on the auto repeat information for key eventsAndy Shaw2015-04-152-7/+6
| | | | | | | | | | | | Task-number: QTBUG-45340 Change-Id: Iecc55987fa784e4bf14317d9d4a085a8f0b58451 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Android: update android gradle plugin versionBogDan Vatra2015-03-231-1/+1
| | | | | | | | | | Change-Id: Id2a53edd5206f57c3b281293ab561a7775f94546 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Android: Don't show translucent system UI on top of QtEskil Abrahamsen Blomfeldt2015-03-122-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On devices by some vendors (Android 4.4+), the default UI theme will have translucent system UI which is placed on top of the main activity layout. When this is unexpected, it may lead to the system UI overlapping with the application's UI on these devices. By default we tell Android to account for the system UI in the main activity's layout, so that the window contents are positioned outside of it. This is done with a new outermost layout which is just used to size the QtLayout correctly. Since there is a use case where people explicitly want translucency on the system UI and have adapted its contents to accommodate for this, we supply the android.app.allow_overlapping_system_ui setting which can be set to true in the AndroidManifest.xml to override the default behavior. [ChangeLog][Android] On devices with translucent system UI, Qt's window is now positioned to avoid overlap with this by default. This behavior can be overridden in the application's AndroidManifest.xml. Change-Id: I2b34e948f3bd655f883f30b0419d9c6ba69242be Task-number: QTBUG-38700 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Android: don't assume a stationary touchpoint unless all history agreesShawn Rutledge2015-03-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | We need to compare each historical location (not just one of them) against the present location to prove that the touchpoint didn't move. We still don't actually send events for every historical touchpoint location though, because that would multiply the event traffic. Task-number: QTBUG-38379 Change-Id: I4b968ef6877031a157493d0a248564c78195c033 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Android: Make sure applicationState is set correctlyBogDan Vatra2015-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | The Activity onResume function is always called before the application gets initialized and we let the applicationState set to the default value which is AppicationInactive. Change-Id: Ifc3c7e3dfc51f2b821f8ca87f8b711f485b6a6f8 Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fixed license headersJani Heikkinen2015-02-179-9/+9
| | | | | | | | | | Change-Id: Ibebe1318d1c2de97601aa07269705c87737083ee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1117-300/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* | Added new private API for Android and onNewIntentPeter Rustler2015-01-212-0/+6
|/ | | | | | | | | | | | | On Android the foreground activity can get intents with onNewIntent. Those intents can not be received in any other way. This is especially true in Android nfc. This patch adds a way to receive those intents in Qt. This patch heavily leans on the implementation of onActivityResult. Change-Id: Ic4dca301f34afe9a528149c3653e545ed3265a3c Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fixes for surface creation/destructionBogDan Vatra2015-01-101-2/+0
| | | | | | | | | | | | | | | | | | | - After reset a surface we must call makeCurrent before we are usign swapBuffers. - No need to set the surface in QPA when surfaceCreated are called in QtSurface.java, some time the OpenGL surface is not fully initialized at this stage. Is better to wait for surfaceChanged which is always fired at least once. - DO NOT reset m_surfaceId to 1 when there is no surface. The problem is that if we have one surface and when we distory it we don't (need to) wait for its surfaceChanged/surfaceDestroyed notifications, and if we create another one quicly it will have the same id (1). Task-number: QTBUG-39712 Change-Id: I2aa31e5b59d81ef3b03624d4636a4381eea6d543 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Update gradle build script.BogDan Vatra2014-12-181-3/+9
| | | | | Change-Id: If5142c039b6307660402f1dbd30ded75e12f8c50 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Make ImhNoPredictiveText work on Samsung devicesPaul Olav Tvete2014-12-121-1/+1
| | | | | | | | | | | Samsung does not support TYPE_TEXT_FLAG_NO_SUGGESTIONS, even though that flag was introduced in API level 5. Therefore, we have to use TYPE_TEXT_VARIATION_VISIBLE_PASSWORD. This effectively makes ImhNoPredictiveText a synonym for ImhSensitiveData on Android. Task-number: QTBUG-43297 Change-Id: I3e7139d144276462e46512445ad7b8e7114d8e32 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Do not initialize accessibility code by default on startup.Jan Arve Saether2014-12-094-47/+86
| | | | | | | | | | | Instead listen for if the accessibility service is running or not by implementing AccessibilityStateChangeListener. This seems to work smoothly when turning on or off TalkBack. This should also improve startup time. Change-Id: I3eb7d6cb9c9c1618afbb59675e4e089c9159019c Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Draw the accessibility focus rectangle properlyJan Arve Saether2014-12-052-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the accessibility focus rectangle was only visible when it overlapped with the m_editText View of QtActivityDelegate. The reason for this is not completely verified, but this is the most likely reason: * The SurfaceView and QtLayout (ViewGroup) does not do any drawing themselves. Due to this their default value of the View::willNotDraw property is true. Because of this Android might assume there is no content for the focus indicator to surround. (This was verified with setting the willNotDraw property to false on the accessibility view); * Another possible reason could be that overlays does not work for SurfaceView. It is documented that overlays does not work for SurfaceViews, so therefore it tried to use the overlay of another view. For some reason it picked the m_editText overlay instead of the QtLayout overlay. See here about overlay: http://developer.android.com/reference/android/view/View.html#getOverlay() The solution is to add another View that covers the whole screen, which will be used solely by android to draw the accessibility focus indicator. In addition, we change the QtAccessibilityDelegate to no longer have the SurfaceView as a host, but have the m_accView as a host (the host can be freely changed, since all accessibility nodes are virtualized through the delegate anyway) For the record, this will be the current ordering of views in QtLayout: (back-to-front order): Qty Default Qty * Surface View(s) >= 1 1 * Accessibility View == 1 1 * Native View(s) >= 0 1 * m_editText View == 1 1 where the m_editText migth be interleaved among the Native Views. [ChangeLog][Android][Accessibility] Fixed an issue where the accessibility focus rectangle was not drawn properly Task-number: QTBUG-38869 Change-Id: I64d6b6ec45b27d0d93ac9dd840de764c18c55d04 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Remove unneeded call to m_editText.bringToFront()Jan Arve Saether2014-12-021-1/+0
| | | | | | | | | There is no need to call bringToFront() when the item was just made to be the last child in the two previous lines. (Child views are ordered in stacking/paint order) Change-Id: Ie9fbe5de6dce2bbc96cd44a8a6a779504cd0becd Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Make sure that created surfaces are stacked on top of previous ones.Jan Arve Saether2014-12-021-5/+12
| | | | | | | | | | | | | The old code would stack the new surface just below the topmost surface. It also did not consider if the m_editText was added to the layout or not (thus, m_layout.getChildCount() - m_nativeViews.size() - 1) was only correct if the editText was added. Spotted by plain code reading while investigating some accessiblity issues. Change-Id: I12c9f373a471c0a7ee624a47232e8952d69c9067 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Use Holo theme on Android 5.0.BogDan Vatra2014-11-271-1/+1
| | | | | | | | | | This is a temporary "fix" until we'll fix all the problems with the new Android Material theme. Task-number: QTBUG-42900 Change-Id: I5485cfd5ac5fdd66cb85da423fe2e63e65be010f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Android: Make old manifests work on Android 5Eskil Abrahamsen Blomfeldt2014-11-211-1/+3
| | | | | | | | | | | On newer Androids, exceptions have started happening when using old manifests that refer to splash.xml because the layout is missing some required attributes. We add these to avoid crashing with these apps. Change-Id: Iefd4718e811df844e53890ee5bc772871d0a9803 Task-number: QTBUG-42807 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Android: Use LocalServerSocket instead of ServerSocketBogDan Vatra2014-11-201-21/+32
| | | | | | | | | | | Using LocalServerSocket is way much safer than ServerSocket because is not using ports which might be in use by other applications. Change-Id: I0e2be0b4561362939950861024f1f95ab819f2c2 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix QtCreator debugging on Android 5.0 devicesAlex Blasche2014-11-191-0/+75
| | | | | | | | | | | | | Add a socket based handshake method for gdb. The previous file based method remains for now and can be activated from Qt creator. It will be used by older creator builds but has the limitation of not working on 5.0 devices. The new mechanism works on pre 5.0 devices too. Task-number: QTCREATORBUG-13418 Change-Id: Ia3ecd1b144b544f52d90940ca885653bcbc477ac Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Extract VectorDrawableBogDan Vatra2014-11-161-0/+111
| | | | | | | Task-numer: QTBUG-42488 Change-Id: Iacc9e6afc75f1f480ba8119c9cbd481beb1d1089 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: copy build.gradle to install folder.BogDan Vatra2014-11-151-0/+2
| | | | | | Task-number: QTCREATORBUG-13311 Change-Id: I4c91164ae1fc593397bb46f98fbc49ef1569da39 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Extract AnimatedStateListDrawableBogDan Vatra2014-11-151-4/+71
| | | | | | | Task-number: QTBUG-42488 Change-Id: I6400c5ba54bdc9a0e1db71986432a6653da9e534 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: Extract default styleBogDan Vatra2014-11-141-1/+23
| | | | | | Task-number: QTBUG-40621 Change-Id: I4569c87c79769752373a9e6e12cb64c89dfc8f94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Android: Extract RippleDrawableBogDan Vatra2014-11-131-1/+23
| | | | | | Task-number: QTBUG-42488 Change-Id: I41fb37adae4664f4a071d794dc4a31a3ee3334aa Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Android: Introduce getAccessibleFieldBogDan Vatra2014-11-131-45/+28
| | | | | | | This method simplifies a lot the code. Change-Id: I7fe775d671ae89e112f313c21f61923133785785 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Android: extract BitmapDrawable attributesJ-P Nurmi2014-11-101-2/+22
| | | | | | Task-number: QTBUG-42488 Change-Id: Idd70e6300f78d96b044928885e71957daad1f5af Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android 5.0: extract new Switch style attributesJ-P Nurmi2014-11-101-0/+5
| | | | | | | | | Switch_showText specifies whether the on/off text is shown in the thumb and Switch_splitTrack specifies whether the track is clipped underneath the thumb. Change-Id: I03fc6b799fe714e7b6e604328901c8c5a418ca6e Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: Fix more exceptions in ExtractStyle.java on Android LBogDan Vatra2014-11-031-11/+44
| | | | | | Task-number: QTBUG-40120 Change-Id: I949f19ced4eefcf7a40e64ad63e316765c6f2f48 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Android: Fix input method hints.Christian Strømme2014-11-031-16/+19
| | | | | | | | | | | | 1. Add comment about the magic TYPE_NUMBER_VARIATION_PASSWORD value. 2. ImhHiddenText, ImhNoPredictiveText and ImhSensitiveData should all disable suggestions. 3. Only ImhSensitiveData sets TYPE_TEXT_VARIATION_VISIBLE_PASSWORD 4. Don't OR date and time to get DateTime... Task-number: QTBUG-38080 Change-Id: If456563983130e9af409ffa8cb717ddf259f1d6b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Add runOnUiThread() functionChristian Strømme2014-11-031-0/+12
| | | | | | | | Enables QRunnables to be run on the UI thread. For now this function is only intended for internal consumption. Change-Id: I5e2abb06104219a9dd55b3308113056e4da5fa07 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: QtActivitiyDelegate: extras can be nullShawn Rutledge2014-10-291-158/+158
| | | | | Change-Id: I3b31cc499067540e6ad7b6d05df75d9ba0e1e615 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Allow QtCreator to pass additional args and env vars to the application.BogDan Vatra2014-10-231-0/+17
| | | | | | | | | We need them to allow developers to easily pass args and env. vars like QSG_RENDER_TIMINGS, QSG_VISUALIZE to theirs apps. The env vars and params must be base64 encoded! Change-Id: I1d781873ffdc6efd40b30543a9fd2514bbdede43 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Update Ministro's requirements.BogDan Vatra2014-10-192-2/+2
| | | | | | Task-number: QTBUG-41968 Change-Id: Ia0c204dd87b9de3cbb7bb388099c435b855ad4d5 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: null pointer checkPaul Olav Tvete2014-10-101-0/+3
| | | | | | | Task-number: QTBUG-41680 Change-Id: I740fb2a6df5613a8ee724b59dab08674a3337236 Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Don't call requestLayout() when changing the geometry.Christian Strømme2014-10-091-2/+0
| | | | | | | | requestLayout() is already called when setLayoutParams() is called, so calling it again is extremely wasteful. Change-Id: Iddfb488830a6b7277a653a84ffacabf966baf0b5 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: Don't include Apache code under LGPLv2 licenseEskil Abrahamsen Blomfeldt2014-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code which extracts style assets for the Android style is licensed under the Apache license, which is not compatible with LGPLv2.1. It is, however, compatible with LGPLv3. This means that the Android platform plugin cannot be LGPLv2.1 as long as this code is included. To minimize licensing confusion, we default to only providing LGPLv3 for Android. If you want to build a LGPLv2.1-compatible library, you can add -no-android-style-assets to the configuration. This will in turn enable the LGPLv2.1 in the configure output, and it will disable the extraction code in the platform plugin. Running the Android style with an LGPLv2.1-compatible platform plugin will work, but it will look horrible. [ChangeLog][Android] Default open-source license for Qt for Android is now LGPLv3. For compatibility with the LGPLv2.1 license, add "-no-android-style-assets" to your configuration. Change-Id: I6c7b52140f38138520871fa7c69debbb4ee90e6c Task-number: QTBUG-41365 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Use PopupMenu when possible.BogDan Vatra2014-10-015-10/+179
| | | | | | | | | | | | On API-11+ we are going to use PopupMenu instead of ContextMenu to show context menus. A PopupMenu displays a Menu in a modal popup window anchored to a View. The popup will appear below the anchor view if there is room, or above it if there is not. Task-number: QTBUG-39736 Change-Id: Ie412ab0935b868348ce5c8bb0bf53571ffefd582 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Add function to change the stacking order in the layout.Christian Strømme2014-09-263-2/+60
| | | | | | | | | | | | | This change enables us to reorder the stacking order used by the layout. This is necessary if we want to influence the drawing order. Lowering or raising views are done separately for native views and Qt surface views, that is, the two different view "types" are moved relative to other views of the same type and Native views are always placed on top. Change-Id: I01cbb88f8efee08877b5972cf330fd25266a2aa9 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Improve the foreign-window implementationChristian Strømme2014-09-261-5/+6
| | | | | | | | | | | | Adds: - Improved geometry calculations (e.g, inside a parent) - Change visibility - proper stacking order. Native views now reserve the top of the stack to ensure that they stay visible. - React to application state changes. Change-Id: I35de0396937fff37ffcd272c9a7d8e9873a91dfb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 04:50:52 +0000