diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2018-06-13 15:52:59 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2018-06-21 11:08:57 +0000 |
| commit | 6af262b6d76ba5dc6d1fa7d7abea460039fea6b9 (patch) | |
| tree | d685919fea3780300b47533e7bbc3d452c84fadb /src/src.pro | |
| parent | 9f8938b89a67ff8da148b7b865576a3d5584c610 (diff) | |
Move androiddeployqt to qtbase
androiddeploytqt is the only official way of deploying applications to the
device, so it is therefore part of the "platform". It therefore needs to live
in qtbase.
Change-Id: I52d7c4427275aacec792b71284a0c10edaf7ab69
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro index 1f7c5d99c1..1c76a2e46f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -53,6 +53,10 @@ src_tools_qdbuscpp2xml.target = sub-qdbuscpp2xml force_bootstrap: src_tools_qdbuscpp2xml.depends = src_tools_bootstrap_dbus else: src_tools_qdbuscpp2xml.depends = src_dbus +src_tools_androiddeployqt.subdir = tools/androiddeployqt +src_tools_androiddeployqt.target = sub-androiddeployqt +src_tools_androiddeployqt.depends = src_corelib + src_tools_qvkgen.subdir = tools/qvkgen src_tools_qvkgen.target = sub-qvkgen force_bootstrap: src_tools_qvkgen.depends = src_tools_bootstrap @@ -183,6 +187,12 @@ qtConfig(dbus) { src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml } + +android { + SUBDIRS += src_tools_androiddeployqt + TOOLS += src_tools_androiddeployqt +} + qtConfig(concurrent): SUBDIRS += src_concurrent qtConfig(gui) { qtConfig(harfbuzz):!qtConfig(system-harfbuzz) { |