diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:01 +0200 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:01 +0200 |
commit | d098ff07179ecc49f75f3070390b7391ebd9da6e (patch) | |
tree | 83ecb7f36fd9bee1a10c8df01667acf1e875d7ac /src/svg/svg.pro | |
parent | 90c3421846e1ea51b0048122e29bcc890d691cab (diff) | |
parent | 35a2f0880831d38c60d2b4820dac808f48f6f3a8 (diff) | |
download | qtsvg-d098ff07179ecc49f75f3070390b7391ebd9da6e.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ic8f6fce9251acf4fbd0e7d5c3996ab2defb81107
Diffstat (limited to 'src/svg/svg.pro')
-rw-r--r-- | src/svg/svg.pro | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index e868e61..f2906ce 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -53,9 +53,3 @@ contains(QT_CONFIG, system-zlib) { else: \ INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib } - -ANDROID_LIB_DEPENDENCIES = \ - lib/libQt5Xml.so - -ANDROID_BUNDLED_FILES += \ - lib/libQt5Xml.so |