diff options
author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2018-06-15 09:39:19 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-06-21 14:39:56 +0000 |
commit | e404a3a2a9bfef5775698955b8045b3c69f65faa (patch) | |
tree | 9ccba98ae2f534757d5eeed63d48e7948ac20e92 /src/src.pro | |
parent | 8f3d0a6653b99c5eb7963b7fc889cb444350a4c2 (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: I8dbff46ea77454aa1d5f41d52e17b52fcc108f2b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/src.pro')
-rw-r--r-- | src/src.pro | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro index ed370052c..0783b7932 100644 --- a/src/src.pro +++ b/src/src.pro @@ -27,10 +27,6 @@ mac { SUBDIRS += macdeployqt } -android { - SUBDIRS += androiddeployqt -} - qtHaveModule(dbus): SUBDIRS += qdbus win32|winrt:SUBDIRS += windeployqt @@ -45,7 +41,6 @@ qtNomakeTools( \ # This is necessary to avoid a race condition between toolchain.prf # invocations in a module-by-module cross-build. cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { - androiddeployqt.depends += qtattributionsscanner qdoc.depends += qtattributionsscanner windeployqt.depends += qtattributionsscanner winrtrunner.depends += qtattributionsscanner |