Fix Mobility install path

5 files changed, 6 insertions, 8 deletions

diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh
index d45dcf0..099ad43 100755
--- a/Necessitas_SDK/build_sdk.sh
+++ b/Necessitas_SDK/build_sdk.sh
@@ -1636,9 +1636,9 @@ function setPackagesVariables
     patchPackage "@@ANDROID_PLATFORM_TOOLS_VERSION@@" $ANDROID_PLATFORM_TOOLS_VERSION "org.kde.necessitas.misc.sdk.platform_tools"
     patchPackage "@@ANDROID_SDK_VERSION@@" $ANDROID_SDK_VERSION "org.kde.necessitas.misc.sdk.base"
 
-    patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi"
-    patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI_ANDROID_4_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi-android-4"
-    patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI-V7A_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi-v7a"
+    patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi/install"
+    patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI_ANDROID_4_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi-android-4/install"
+    patchPackage "@@NECESSITAS_QTMOBILITY_ARMEABI-V7A_INSTALL_PATH@@" "$TEMP_PATH/$CHECKOUT_BRANCH/Android/Qt/$NECESSITAS_QT_VERSION_SHORT/build-mobility-armeabi-v7a/install"
     patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI_INSTALL_PATH@@" "/data/data/org.kde.necessitas.ministro/files/qt"
     patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI_ANDROID_4_INSTALL_PATH@@" "/data/data/org.kde.necessitas.ministro/files/qt"
     patchPackage "@@NECESSITAS_QTWEBKIT_ARMEABI-V7A_INSTALL_PATH@@" "/data/data/org.kde.necessitas.ministro/files/qt"
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml
index 57d4c63..b5fe7af 100644
--- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml
+++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi/meta/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>QtMobility @@NECESSITAS_QTMOBILITY_VERSION@@-armeabi</DisplayName>
+    <DisplayName>QtMobility @@NECESSITAS_QTMOBILITY_VERSION@@-armeabi Android API 5+</DisplayName>
     <Description>Development libraries for development applications on Android devices, armeabi architecture.</Description>
     <Version>@@NECESSITAS_QTMOBILITY_VERSION@@</Version>
     <ReleaseDate>@@TODAY@@</ReleaseDate>
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_android_4/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_android_4/meta/package.xml
index d9d0f2d..930baa8 100644
--- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_android_4/meta/package.xml
+++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_android_4/meta/package.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>QtMobility @@NECESSITAS_QTMOBILITY_VERSION@@-armeabi</DisplayName>
+    <DisplayName>QtMobility @@NECESSITAS_QTMOBILITY_VERSION@@-armeabi Android API 4+</DisplayName>
     <Description>Development libraries for development applications on Android devices, armeabi architecture.</Description>
     <Version>@@NECESSITAS_QTMOBILITY_VERSION@@</Version>
     <ReleaseDate>@@TODAY@@</ReleaseDate>
     <Name>org.kde.necessitas.android.qtmobility.armeabi_android_4</Name>
     <Dependencies>org.kde.necessitas.android.qt.armeabi_android_4,org.kde.necessitas.android.qtwebkit.armeabi_android_4</Dependencies>
     <Script>installscript.qs</Script>
-    <Default>true</Default>
     <InstallPriority>2</InstallPriority>
     <SortingPriority>2</SortingPriority>
 </Package>
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml
index 7e3f341..003850d 100644
--- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml
+++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtmobility.armeabi_v7a/meta/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>QtMobility @@NECESSITAS_QTMOBILITY_VERSION@@-armeabi_v7a</DisplayName>
+    <DisplayName>QtMobility @@NECESSITAS_QTMOBILITY_VERSION@@-armeabi_v7a Android API 5+</DisplayName>
     <Description>Development libraries for development applications on Android devices, armeabi_v7a architecture.</Description>
     <Version>@@NECESSITAS_QTMOBILITY_VERSION@@</Version>
     <ReleaseDate>@@TODAY@@</ReleaseDate>
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_android_4/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_android_4/meta/package.xml
index f9455f8..205864e 100644
--- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_android_4/meta/package.xml
+++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_android_4/meta/package.xml
@@ -7,7 +7,6 @@
     <Name>org.kde.necessitas.android.qtwebkit.armeabi_android_4</Name>
     <Dependencies>org.kde.necessitas.android.qt.armeabi_android_4</Dependencies>
     <Script>installscript.qs</Script>
-    <Default>true</Default>
     <InstallPriority>1</InstallPriority>
     <SortingPriority>1</SortingPriority>
 </Package>