diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-20 04:28:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-20 04:28:09 +0000 |
| commit | d1ff9b419da5e3ace68479b02582222486ec9703 (patch) | |
| tree | a978de6c9844cf37bbd7dc5cecc298bf51f4dce3 /mkspecs/features/android/resolve_target.prf | |
| parent | 8a4ea3f03807c4d75ef73609dae30cfcf427c3ea (diff) | |
| parent | ce09ef431373f45d14ce0a6e7de24aee3666093d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/android/resolve_target.prf')
| -rw-r--r-- | mkspecs/features/android/resolve_target.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/android/resolve_target.prf b/mkspecs/features/android/resolve_target.prf index 2bbeffcfd0..25682cd894 100644 --- a/mkspecs/features/android/resolve_target.prf +++ b/mkspecs/features/android/resolve_target.prf @@ -1,2 +1,3 @@ +load(resolve_config) load(android) load(resolve_target) |