diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2013-05-08 18:19:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 23:31:46 +0200 |
| commit | 77c021636966530bed8187b3f5f00f0c5a04230f (patch) | |
| tree | e32f2298fb84270291bf85732d6028e838fa9cf5 | |
| parent | 23ee57c5e97c2108c20929bac08c7f0bbb741a4c (diff) | |
Android: Added the attribute "extends".
Enables us to detect if a library should be added as a dependency or not.
E.g., libQt5MultimediaQuick_p should only be added as a dependency if an
application is using both QtMultimedia _and_ QtQuick.
Task-number: QTBUG-30861
Change-Id: Id62642c40e2ecca7149d249f65c7b0c950898374
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | mkspecs/features/qt_android_deps.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qt_android_deps.prf b/mkspecs/features/qt_android_deps.prf index ba37649201..c258d55687 100644 --- a/mkspecs/features/qt_android_deps.prf +++ b/mkspecs/features/qt_android_deps.prf @@ -43,7 +43,10 @@ DEPENDENCY_FILE = $$ANDROID_DEPENDS_DIR$$TARGET-android-dependencies.xml !isEmpty(ANDROID_LIB_DEPENDENCIES) { for(LIB_FILE, ANDROID_LIB_DEPENDENCIES) { - FILE_CONTENT += "<lib file=\"$$LIB_FILE\" />" + EXTENDS = $$section(LIB_FILE, ":", 1, 1) + !isEmpty(EXTENDS): EXTENDS = "extends=\"$$EXTENDS\"" + LIB_FILE = $$section(LIB_FILE, ":", 0, 0) + FILE_CONTENT += "<lib file=\"$$LIB_FILE\" $$EXTENDS />" } } |