diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
| commit | f255b1e8e297e7e1363921580007145cff574e0d (patch) | |
| tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /src/android/templates/res/values | |
| parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
| parent | bf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I54741635460bb2d8f3fd0be535ee1968d6c442bb
Diffstat (limited to 'src/android/templates/res/values')
| -rw-r--r-- | src/android/templates/res/values/libs.xml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/android/templates/res/values/libs.xml b/src/android/templates/res/values/libs.xml index 4009a7785a..db777bf433 100644 --- a/src/android/templates/res/values/libs.xml +++ b/src/android/templates/res/values/libs.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <resources> <array name="qt_sources"> - <item>https://download.qt.io/ministro/android/qt5/qt-5.9</item> + <item>https://download.qt.io/ministro/android/qt5/qt-5.14</item> </array> <!-- The following is handled automatically by the deployment tool. It should @@ -12,12 +12,17 @@ </array> <array name="qt_libs"> - <!-- %%INSERT_QT_LIBS%% --> + <!-- %%INSERT_QT_LIBS%% --> </array> <array name="bundled_in_lib"> <!-- %%INSERT_BUNDLED_IN_LIB%% --> </array> + + <array name="load_local_libs"> + <!-- %%INSERT_LOCAL_LIBS%% --> + </array> + <array name="bundled_in_assets"> <!-- %%INSERT_BUNDLED_IN_ASSETS%% --> </array> |