diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-27 10:42:08 +0200 |
| commit | 7702fe86029c771e641a918baa221b9737c0f18e (patch) | |
| tree | 8e0795bc4c701518e1c66922f8e8b0cb359da155 /src/src.pro | |
| parent | 1dd54b5647d33416c39fb41fdab560c815356951 (diff) | |
| parent | 38550c562d918e783bb609622bc8fb46de1bfec4 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 403bf58a0a..43fc06f2e5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -95,6 +95,9 @@ src_3rdparty_libpng.target = sub-3rdparty-libpng src_3rdparty_freetype.subdir = $$PWD/3rdparty/freetype src_3rdparty_freetype.target = sub-3rdparty-freetype +src_3rdparty_gradle.subdir = $$PWD/3rdparty/gradle +src_3rdparty_gradle.target = sub-3rdparty-gradle + src_angle.subdir = $$PWD/angle src_angle.target = sub-angle @@ -204,7 +207,7 @@ SUBDIRS += src_plugins nacl: SUBDIRS -= src_network src_testlib -android: SUBDIRS += src_android +android: SUBDIRS += src_android src_3rdparty_gradle TR_EXCLUDE = \ src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \ |