diff options
author | Bramastyo Harimukti Santoso <bram.santoso@qt.io> | 2021-01-19 16:23:52 +0100 |
---|---|---|
committer | Bramastyo Harimukti Santoso <bram.santoso@qt.io> | 2021-01-19 16:47:09 +0100 |
commit | df878f3935fe28dd3d7253b9fa59d65db331eed0 (patch) | |
tree | df27168c9196d4ff4458f86a9fefdd6ecee84d47 /settings_app_android.pro | |
parent | 88c1d70ca626be6420160c6218e07867541ae8e3 (diff) | |
parent | e5dcdea6750b7689feae69083f39f283cc79b9b1 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I6f570e6c387b10e7c07e925429d275761bdf6cda
Diffstat (limited to 'settings_app_android.pro')
-rw-r--r-- | settings_app_android.pro | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/settings_app_android.pro b/settings_app_android.pro index 091601bf..1d3aba11 100644 --- a/settings_app_android.pro +++ b/settings_app_android.pro @@ -5,14 +5,28 @@ TEMPLATE = subdirs include(config.pri) SUBDIRS += \ - src/drivedata/frontend/frontend.pro \ - src/drivedata/backend/backend.pro \ - src/drivedata/qml_plugin/qml_plugin.pro \ - src/remotesettings/frontend/frontend.pro \ - src/remotesettings/backend/backend.pro \ - src/remotesettings/qml_plugin/qml_plugin.pro \ - src/remotesettings/app/app.pro + drivedata_frontend \ + drivedata_backend \ + drivedata_qml_plugin \ + remotesettings_frontend \ + remotesettings_backend \ + remotesettings_qml_plugin \ + remotesettings_app \ -CONFIG += ordered +drivedata_frontend.file = src/drivedata/frontend/frontend.pro +drivedata_backend.file = src/drivedata/backend/backend.pro +drivedata_qml_plugin.file = src/drivedata/qml_plugin/qml_plugin.pro +remotesettings_frontend.file = src/remotesettings/frontend/frontend.pro +remotesettings_backend.file = src/remotesettings/backend/backend.pro +remotesettings_qml_plugin.file = src/remotesettings/qml_plugin/qml_plugin.pro +remotesettings_app.file = src/remotesettings/app/app.pro -OTHER_FILES += src/remotesettings/settings.qface +drivedata_backend.depends = drivedata_frontend +drivedata_qml_plugin.depends = drivedata_frontend + +remotesettings_backend.depends = remotesettings_frontend +remotesettings_qml_plugin.depends = remotesettings_frontend + +remotesettings_app.depends = remotesettings_frontend + +OTHER_FILES += src/remotesettings/remotesettings.qface |