diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
| commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
| tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /src/3rdparty | |
| parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
| parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/gradle/qt_attribution.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/gradle/qt_attribution.json b/src/3rdparty/gradle/qt_attribution.json index 3545af0f0c..699fe311cd 100644 --- a/src/3rdparty/gradle/qt_attribution.json +++ b/src/3rdparty/gradle/qt_attribution.json @@ -1,6 +1,8 @@ { "Id": "android-gradle-wrapper", "Name": "Gradle wrapper", + "QDocModule": "qtcore", + "QtParts": ["tools"], "Homepage": "https://gradle.org", "Version": "3.4.1", "DownloadLocation": "https://github.com/gradle/gradle/releases/tag/v3.4.1", |