diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-27 08:43:19 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-27 09:21:47 +0000 |
| commit | d5df0e99490098a8ed5ccdb29a82f796d41044e3 (patch) | |
| tree | c540bf33502b2aa4f0c0ae8a28a8fc22a4a78ac6 /src/src.pro | |
| parent | 1e7795ef604fe22895b8ec5c2278fea4217f2c07 (diff) | |
| parent | 7702fe86029c771e641a918baa221b9737c0f18e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
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 \ |