From f85353ae4ddadb5cccdcefd785658ce5d19f127e Mon Sep 17 00:00:00 2001 From: Grigorii Zimin Date: Thu, 16 Jan 2020 08:07:58 +0300 Subject: [companion app] replace "ordered" build by proper dependencies Change-Id: Ie52647157032af835c60b269fbe13c488736be44 Reviewed-by: Egor Nemtsev --- settings_app_android.pro | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'settings_app_android.pro') 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 -- cgit v1.2.3