Although this bug was there in Qt 5.3 as well, something has changed
in our build system that causes readelf to return libraries in a
different order than before. In particular, the QtMultimedia dependency
is now listed before QtQuick if it's listed first in the QT variable in
the .pro file. This caused the following bug:

When we read the manual dependencies from the XML specification,
then we assume the dependencies of these are already met (otherwise
they should not be added). Therefore, we need to load these
dependencies last, not intermingled with the actual direct
dependencies of the application.

What would happen is that Qt5Multimedia came before Qt5Quick, and
triggered adding Qt5MultimediaQuick_p before Qt5Quick. This of course
depends on Qt5Quick so it needs to be added after it (which is why
it is only added if the application itself depends on Qt Quick).

Change-Id: Ifa97d85645cff49ebf65d4ce3fc2101506346695
Task-number: QTBUG-42012
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

The convenience of ANDROID_DEPLOYMENT_DEPENDENCIES would be
greatly increased if you could include a directory and have its
contents be added recursively to the deployment, instead of
listing each file individually.

Change-Id: I3cf3248007369122ea6ba98ab79f7f2f951a26c3
Task-number: QTBUG-41674
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3
- Removed LICENSE.GPL

Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>

Trying to run a process using the relative path on windows fails.

Task-number: QTBUG-41431
Change-Id: I0c9aa837dc7a556372b1018feb2f7f5c14c2652a
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

The user might copy files in assets folder at install time.

Change-Id: Ib26f6d0546aae70788c09bf455835647e3deb602
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

The file system is case insensitive on Windows, and if you e.g.
specified a lower case drive letter in your prefix when building
Qt, then we would bail out because we would think the path
of any given import was located outside the import paths specified.

Task-number: QTBUG-41012
Change-Id: I22a1be32a221cd754dfed93e125d685bade65828
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Make debugging work with both Qt Creator 3.1 and the upcoming 3.2.

Change-Id: I0d13d353fe560aee0c0103959d9619f14786ba57
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Using gradle it doesn't need ant to be installed anymore.
It's also much way faster than ant (on multiple builds),
on my computer is 25-50% faster than ant.

[ChangeLog][Android][androiddeployqt] Added Gradle support to build the
APK.

Change-Id: I3ed2c7215e38a43f5d5f62c3e6eedb601182e81a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

This option is needed to install the package in a separate step without
rebuilding it.

Change-Id: I1fb099d7afd3d604a8a4ca89e1551529d2255b25
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Enables qmlimportscanner support in the deployment tool. Will
use the root path set by qmake to determine dependencies, which
by default will be the location of the project's .pro file.

Other effects: This removes the requirement to add QT += foobar
to enable using imports from the module QtFooBar, and it also
enables adding custom QML imports.

[ChangeLog][Android][androiddeployqt] Added support for using
qmlimportscanner to detect QML import dependencies of application.

Task-number: QTBUG-34175
Change-Id: I5af5964f9e453121eeff8b442f0c5e72676b1fbe
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Stating with android tools v23, the zipAlign tool was moved from
<android_sdk>/tools to <android_sdk>/build-tools/<build_tools_version>.

Task-number:QTBUG-40481
Change-Id: Id9207b6e382b0e79522d9fc529453ccd39aebe0d
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Currently, the only way to launch an Android application is through
the platform plugin, which of course depends on Qt Gui. This causes
problems running corelib autotests, since they have QT = core in
the .pro file and thus will not deploy or load the platform plugin.

At some point, we may have a way to launch pure corelib-applications
on Android (like services), but until then, we need to hardcore the
dependency on Qt Gui to make sure these autotests run properly.

Change-Id: Ica794af972a06ec021c1fa28333866296eab96e0
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Currently, androiddeployqt expects all the detected dependencies
to reside inside the Qt installation directory. Once we add support
for the qmlimportscanner, however, they can reside in any of
the qml import paths. The refactoring prepares the code for this,
separating the relative path (the path of the file when it is
installed on the device) and the absolute path (the source file).

Task-number: QTBUG-34175
Change-Id: I5173034a02e29f88f8ca6f2b61c0caea6ba71778
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Mainly for consistency with the old deployment method in Qt Creator,
androiddeployqt will uninstall any previously installed instances
of the application before installing it. This will remove any caches
or user data stored by the application. In many cases (most) it
would be more convenient to just overwrite the existing instance,
but keep all caches intact. This patch adds the --reinstall option,
symmetrical to --install. If enabled, the uninstall step will be
skipped.

[ChangeLog][androiddeployqt] Added option to install an APK without
uninstalling previous instances of same application.

Task-number: QTBUG-35845
Change-Id: I93bed4fefda6ed5295f333002a4958654b3f911c
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

The popen() function on Windows executes the command using /s,
probably for legacy reasons, which causes the behavior that it
removes the first and last quotes in the command line and otherwise
preserves it perfectly. This causes strings in which both
the executable name and at least one argument has to be quoted, to
be unparsable by the shell once it has been processed. To work around
this we wrap the string in quotes on Windows.

Since we added quotes to arguments for the jarsigner command in Qt 5.3.0
we introduced a regression that made it impossible to sign APKs on Windows.

Task-number: QTBUG-38962
Change-Id: I2b618e1996753645766d25ca06b14e1985d7eacd
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

In 08672adb97c0707c513850a27aaec59327874260 in qtbase, the
MODULE_PLUGIN_TYPES of QtGui was expanded to contain some
more plugin types which are not built on Android, causing
warnings during every deployment. Since MODULE_PLUGIN_TYPES
is common to all platforms we should just ignore it if it
specifies plugins that do not exist.

[ChangeLog][androiddeployqt] Remove warning about missing
dependency.

Task-number: QTBUG-38651
Change-Id: I57a2c1d79b859981b3adf2772be4f0cd8a98be12
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Makes it possible to specify a set of runtime dependencies to be bundled
with the application to be used afterwards.
To do so, adds a new entry in the json file named "android-extra-plugins"
that will specify those dependencies in a list.
It will put the text files within the assets directory and the libraries
and plugins in the architecture's directory in libs/.

Change-Id: I2aaa4886252743bd333d8d18404fd41e85bbd8b5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Third party library projects can easily be added to the Android
package source directory and added to the project using
project.properties, but "android update" needs to be run on it
to produce some local build files before it can be included in the
build. We can do this for people so that they can use third party
library projects without having to put build files in their source
directory.

[ChangeLog][Android][Deployment] Detect linked library projects
in the package source directory and automatically run "android update"
on these.

Task-number: QTBUG-38322
Change-Id: I0bf9b8708a7ec28ed5429379215b12a65d05416a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

E/dalvikvm(10899): dlopen("/data/local/tmp/qt/lib/libQt5Quick.so") failed:
Cannot load library: soinfo_link_image(linker.cpp:1635): could not load
library "libQt5Qml.so" needed by "libQt5Quick.so";
caused by load_library(linker.cpp:745): library "libQt5Qml.so" not found

Task-number: QTBUG-38606
Change-Id: I8fcb42782a835842a69b0b4d2de4f1ed042555c6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Code is borrowed from qmake to escape and quote arguments passed
to shell tools as needed.

Task-number: QTBUG-38249
Change-Id: I4932df3963b0c1706374b4ba78c5e23c8e3304d2
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

Change-Id: I0591cba588e2b5ed1fc29aaf32fb40e6ee0cd97d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

There is a bug in "adb push" which makes it fail when the input
directory ends with a slash on Windows. This made it impossible
to use the debug deployment method on Windows.

[ChangeLog][Android][androiddeployqt] Fixed debug deployment on
Windows.

Task-number: QTBUG-37028
Change-Id: I99bef5f2dc879cbd08dc0c7e6765395095b264cf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Features declared by Qt modules are not necessarily used by
an app, so we mark them as unrequired. It's the responsibility
of the developer to mark them as required if needed.

Task-number: QTBUG-36921
Change-Id: Id0de248347d49c119bc9a1c37f4d0882065a1601
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

To speed up listing files from assets, we pregenerate a file
list which can be used to prepopulate the cache in the
assets file engine.

Task-number: QTBUG-33704
Change-Id: I6aee37725760e8f09db18b4d2169d723e7e25027
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

Change-Id: I871aaa2488f2df0d6af5f51b3a37bc0e8bc8a1c3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Starting with Qt 5.3 there is only one platform plugin.

Change-Id: If0e88c8662c88b23fa2b714796684846e7c066ba
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Change-Id: I487cfd4fde5f77174ce4a0fc7bed7c75cb0ecebd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Change-Id: I11d09940d28f13f1e1d9939ee46e2c321d8cb2a9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Change-Id: I88086a60209b399d43cab1dc68f564878fd7b51f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

The input to the jarsigner (specifically the password, alias,
file name, etc.) can contain spaces, so the arguments need
to be quoted.

[ChangeLog][Android][androiddeployqt] Fixed signing packages
using arguments containing spaces.

Task-number: QTBUG-36327
Change-Id: Ie673ab91da4ffe074851a6ddef96efbb7657636b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

Apparently that doesn't work.

Task-number: QTCREATORBUG-11319
Change-Id: If97f0bc5c49e99dac42ec3c539f5ba4b2f060bec
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

The Android files in the project should always overwrite the
equivalents in the template, even if the template files have
been modified after the project files. Otherwise an old project
could stop working when Qt was updated.

Task-number: QTBUG-35147
[ChangeLog][Android][QTBUG-35147] Make sure Android files in the
project always overwrite the equivalent files in the project
template.

Change-Id: I4c38061501cbcaa1061e376e7b49a1a0efe596cf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Change-Id: I3b779f82ef5b4b474eda9e6f2911a7bf46b8c87d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Store and check the Qt instalattion folder.

Change-Id: I7a890da82d5b7a4ae467d157daa7c4e41b15a11b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Debug deployment had a major flaw which made it slower than
just bundling the libraries. For every deployment it would
recursively extract the timestamp of all files from the
remote tmp/ directory. This took about 20 seconds.

I've made some improvements:
1. Just use a single modification.txt file which is updated for every
deployment and only update Qt files that have changed since the last
deployment.

2. Deploy all Qt files in debug deployment instead of just the
dependencies of the app, to make it possible to add dependencies to
the app at a later time without clearing the remote cache.

3. Instead of doing an adb push call for each file, we now just do one
big push after building the local temporary directory.

4. I added a timing mechanism to make it simpler to debug problems
related to this.

Task-number: QTBUG-35401
[ChangeLog][androiddeployqt][QTBUG-35401] Speed up debug deployment.

Change-Id: Ida94c73fc48a0a627203398a86732a94baff1451
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

In order to filter out devices that do not support OpenGLES 2 in
Google Play, we need to report that we depend on it when using
Qt Quick or Qt OpenGL. It would have been more generic to add the
information to the meta-data in the module, but since we already
have the information there, just in the form of forcing the
use of the GL plugin, we might as well use that and not complicate
the dependency XMLs any further.

Task-number: QTBUG-32491
Change-Id: I2af044be010fcd0a8076906de6385701041b9c01
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

We would put the "-v" option inside the quotes in the zipalign
command, causing the shell to look for the executable named
"zipalign -v".

Task-number: QTBUG-34588
Change-Id: I88269cada9d77c3ddcceb6133f9bc8cf275c425a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

When we skip a plugin due to missing dependencies, we should
output which dependencies are missing so that people can easily
find out what to add to their .pro files.

Task-number: QTBUG-34586
Change-Id: I64e1687e4ad67165b0d8708e1e1fcedc10883515
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Read the permissions/features required for the module from the
dependency XML and update the default AndroidManifest.xml to
include these.

Task-number: QTBUG-33953
Change-Id: I52edce7ebf826d242fbb49dcd8069c60a1381116
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

When no custom AndroidManifest.xml is specified, we need to
generate a sensible default name like before.

Change-Id: I9411594c43f6d2b3a49686bb6fbab9d999d788c3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>