Final touches

9 files changed, 51 insertions, 14 deletions

diff --git a/Necessitas_SDK/build_sdk.sh b/Necessitas_SDK/build_sdk.sh
index 8176055..d45dcf0 100755
--- a/Necessitas_SDK/build_sdk.sh
+++ b/Necessitas_SDK/build_sdk.sh
@@ -480,7 +480,7 @@ function makeInstallMinGWLibsAndTools
 
     mkdir texinfo
     pushd texinfo
-	downloadIfNotExists texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma http://heanet.dl.sourceforge.net/project/mingw/MSYS/texinfo/texinfo-4.13a-2/texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma
+    downloadIfNotExists texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma http://heanet.dl.sourceforge.net/project/mingw/MSYS/texinfo/texinfo-4.13a-2/texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma
     rm -rf texinfo-4.13a-2-msys-1.0.13-bin.tar
     7za x texinfo-4.13a-2-msys-1.0.13-bin.tar.lzma
     tar -xvf texinfo-4.13a-2-msys-1.0.13-bin.tar
diff --git a/Necessitas_SDK/ministrorepogen/main.cpp b/Necessitas_SDK/ministrorepogen/main.cpp
index 1560fdf..b0e1368 100644
--- a/Necessitas_SDK/ministrorepogen/main.cpp
+++ b/Necessitas_SDK/ministrorepogen/main.cpp
@@ -145,6 +145,13 @@ int main(int argc, char *argv[])
             childs=childs.nextSiblingElement("lib");
         }
 
+        childs=element.firstChildElement("replaces").firstChildElement("lib");
+        while(!childs.isNull())
+        {
+            libs[libraryName].replaces<<childs.attribute("name");
+            childs=childs.nextSiblingElement("lib");
+        }
+
         childs=element.firstChildElement("needs").firstChildElement("item");
         while(!childs.isNull())
         {
@@ -206,6 +213,13 @@ int main(int argc, char *argv[])
                 outXmlFile.write("\t\t</depends>\n");
             }
 
+            if (libs[key].replaces.size())
+            {
+                outXmlFile.write("\t\t<replaces>\n");
+                foreach(const QString & libName, libs[key].replaces)
+                    outXmlFile.write(QString("\t\t\t<lib name=\"%1\"/>\n").arg(libName).toUtf8());
+                outXmlFile.write("\t\t</replaces>\n");
+            }
 
             if (libs[key].needs.size())
             {
diff --git a/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml b/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml
index 3bb63e2..9f273d9 100644
--- a/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml
+++ b/Necessitas_SDK/ministrorepogen/rules-armeabi-android-4.xml
@@ -8,7 +8,7 @@
         </jars>
     </platforms>
 
-    <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtLoader" applicationParameters="-platform	android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl	QML_IMPORT_PATH=MINISTRO_PATH/qt/imports	QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins">
+    <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtActivityDelegate" applicationParameters="-platform	android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl	QML_IMPORT_PATH=MINISTRO_PATH/qt/imports	QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins">
         <lib file="lib/libQtCore.so" >
             <needs>
                 <item name="QtIndustrius" type="jar" file="jar/QtIndustrius-%1.jar"/>
@@ -67,8 +67,6 @@
             </depends>
         </lib>
         <lib file="plugins/platforms/android/libandroid-4.so" name="QtAndroidPlatformPlugin" platform="4" level="9999" />
-        <lib file="plugins/platforms/android/libandroid-5.so" name="QtAndroidPlatformPlugin" platform="5" level="9999" />
-        <lib file="plugins/platforms/android/libandroid-8.so" name="QtAndroidPlatformPlugin" platform="8" level="9999" />
 
 
         <lib file="lib/libQtSystemInfo.so">
@@ -186,5 +184,5 @@
         </lib>
         <lib file="plugins/mediaservice/libqtmultimediakit_androidmedia.so" name="QtAndroidMKMediaPlugin" platform="8" level="9999" />
         <lib file="plugins/mediaservice/libqtmultimediakit_androidcam.so" name="QtAndroidMKCameraPlugin" platform="8" level="9999" />
-</libs>
+    </libs>
 </root>
diff --git a/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml b/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml
index 535f13e..cfd58c4 100644
--- a/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml
+++ b/Necessitas_SDK/ministrorepogen/rules-armeabi-v7a.xml
@@ -19,7 +19,7 @@
         </jars>
     </platforms>
 
-    <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtLoader" applicationParameters="-platform	android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl	QML_IMPORT_PATH=MINISTRO_PATH/qt/imports	QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins">
+    <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtActivityDelegate" applicationParameters="-platform	android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl	QML_IMPORT_PATH=MINISTRO_PATH/qt/imports	QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins">
         <lib file="lib/libQtCore.so" >
             <needs>
                 <item name="QtIndustrius" type="jar" file="jar/QtIndustrius-%1.jar"/>
@@ -77,9 +77,21 @@
                 <lib name="QtAndroidPlatformPlugin"/>
             </depends>
         </lib>
-        <lib file="plugins/platforms/android/libandroid-4.so" name="QtAndroidPlatformPlugin" platform="4" level="9999" />
         <lib file="plugins/platforms/android/libandroid-5.so" name="QtAndroidPlatformPlugin" platform="5" level="9999" />
         <lib file="plugins/platforms/android/libandroid-8.so" name="QtAndroidPlatformPlugin" platform="8" level="9999" />
+        <lib file="plugins/platforms/android/libandroid-9.so" name="QtAndroidPlatformPlugin" platform="9" level="9999" />
+
+        <lib file="lib/libQtOpenGL.so">
+            <depends>
+                <lib name="QtAndroidGLPlatformPlugin"/>
+            </depends>
+            <replaces>
+                <lib name="QtAndroidPlatformPlugin"/>
+            </replaces>
+        </lib>
+        <lib file="plugins/platforms/android/libandroidGL-5.so" name="QtAndroidGLPlatformPlugin" platform="5" level="9999" />
+        <lib file="plugins/platforms/android/libandroidGL-8.so" name="QtAndroidGLPlatformPlugin" platform="8" level="9999" />
+        <lib file="plugins/platforms/android/libandroidGL-9.so" name="QtAndroidGLPlatformPlugin" platform="9" level="9999" />
 
 
         <lib file="lib/libQtSystemInfo.so">
@@ -197,5 +209,5 @@
         </lib>
         <lib file="plugins/mediaservice/libqtmultimediakit_androidmedia.so" name="QtAndroidMKMediaPlugin" platform="8" level="9999" />
         <lib file="plugins/mediaservice/libqtmultimediakit_androidcam.so" name="QtAndroidMKCameraPlugin" platform="8" level="9999" />
-</libs>
+    </libs>
 </root>
diff --git a/Necessitas_SDK/ministrorepogen/rules-armeabi.xml b/Necessitas_SDK/ministrorepogen/rules-armeabi.xml
index 535f13e..f578d28 100644
--- a/Necessitas_SDK/ministrorepogen/rules-armeabi.xml
+++ b/Necessitas_SDK/ministrorepogen/rules-armeabi.xml
@@ -19,7 +19,7 @@
         </jars>
     </platforms>
 
-    <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtLoader" applicationParameters="-platform	android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl	QML_IMPORT_PATH=MINISTRO_PATH/qt/imports	QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins">
+    <libs excludePaths="imports;plugins" loaderClassName="org.kde.necessitas.industrius.QtActivityDelegate" applicationParameters="-platform  android" environmentVariables="MINISTRO_SSL_CERTS_PATH=MINISTRO_PATH/qt/ssl QML_IMPORT_PATH=MINISTRO_PATH/qt/imports    QT_PLUGIN_PATH=MINISTRO_PATH/qt/plugins">
         <lib file="lib/libQtCore.so" >
             <needs>
                 <item name="QtIndustrius" type="jar" file="jar/QtIndustrius-%1.jar"/>
@@ -77,9 +77,21 @@
                 <lib name="QtAndroidPlatformPlugin"/>
             </depends>
         </lib>
-        <lib file="plugins/platforms/android/libandroid-4.so" name="QtAndroidPlatformPlugin" platform="4" level="9999" />
         <lib file="plugins/platforms/android/libandroid-5.so" name="QtAndroidPlatformPlugin" platform="5" level="9999" />
         <lib file="plugins/platforms/android/libandroid-8.so" name="QtAndroidPlatformPlugin" platform="8" level="9999" />
+        <lib file="plugins/platforms/android/libandroid-9.so" name="QtAndroidPlatformPlugin" platform="9" level="9999" />
+
+        <lib file="lib/libQtOpenGL.so">
+            <depends>
+                <lib name="QtAndroidGLPlatformPlugin"/>
+            </depends>
+            <replaces>
+                <lib name="QtAndroidPlatformPlugin"/>
+            </replaces>
+        </lib>
+        <lib file="plugins/platforms/android/libandroidGL-5.so" name="QtAndroidGLPlatformPlugin" platform="5" level="9999" />
+        <lib file="plugins/platforms/android/libandroidGL-8.so" name="QtAndroidGLPlatformPlugin" platform="8" level="9999" />
+        <lib file="plugins/platforms/android/libandroidGL-9.so" name="QtAndroidGLPlatformPlugin" platform="9" level="9999" />
 
 
         <lib file="lib/libQtSystemInfo.so">
@@ -197,5 +209,5 @@
         </lib>
         <lib file="plugins/mediaservice/libqtmultimediakit_androidmedia.so" name="QtAndroidMKMediaPlugin" platform="8" level="9999" />
         <lib file="plugins/mediaservice/libqtmultimediakit_androidcam.so" name="QtAndroidMKCameraPlugin" platform="8" level="9999" />
-</libs>
+    </libs>
 </root>
diff --git a/Necessitas_SDK/ministrorepogen/sortlibs.h b/Necessitas_SDK/ministrorepogen/sortlibs.h
index 14c3885..e52a923 100644
--- a/Necessitas_SDK/ministrorepogen/sortlibs.h
+++ b/Necessitas_SDK/ministrorepogen/sortlibs.h
@@ -43,6 +43,7 @@ struct Library
     int level;
     QString relativePath;
     QStringList dependencies;
+    QStringList replaces;
     QVector<NeedsStruct> needs;
     QString name;
     int platform;
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml
index 449222e..94c0a17 100644
--- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml
+++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi/meta/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>QtWebKit @@NECESSITAS_QTWEBKIT_VERSION@@-armeabi</DisplayName>
+    <DisplayName>QtWebKit @@NECESSITAS_QTWEBKIT_VERSION@@-armeabi android 5+</DisplayName>
     <Description>Development libraries for development applications on Android devices, armeabi architecture.</Description>
     <Version>@@NECESSITAS_QTWEBKIT_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 9026869..f9455f8 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
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>QtWebKit @@NECESSITAS_QTWEBKIT_VERSION@@-armeabi</DisplayName>
+    <DisplayName>QtWebKit @@NECESSITAS_QTWEBKIT_VERSION@@-armeabi Android API 4+</DisplayName>
     <Description>Development libraries for development applications on Android devices, armeabi architecture.</Description>
     <Version>@@NECESSITAS_QTWEBKIT_VERSION@@</Version>
     <ReleaseDate>@@TODAY@@</ReleaseDate>
diff --git a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml
index 25e7885..3958ed7 100644
--- a/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml
+++ b/Necessitas_SDK/packages/org.kde.necessitas.android.qtwebkit.armeabi_v7a/meta/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Package>
-    <DisplayName>QtWebKit @@NECESSITAS_QTWEBKIT_VERSION@@-armeabi_v7a</DisplayName>
+    <DisplayName>QtWebKit @@NECESSITAS_QTWEBKIT_VERSION@@-armeabi_v7a Android API 5+</DisplayName>
     <Description>Development libraries for development applications on Android devices, armeabi_v7a architecture.</Description>
     <Version>@@NECESSITAS_QTWEBKIT_VERSION@@</Version>
     <ReleaseDate>@@TODAY@@</ReleaseDate>