- Merged QWidget and QML Qt frontends, just define QT_WIDGET to select the QWidget one

- Coded a resource package download GUI based on QWidget
- Removed compilation warning on unused variable
- Updated Maemo desktop file to start directly the binary
- Updated .pro file
- Updated version macros to be able to compose the resource package file
- Updated QML interface for Android
- Updated QML interface to not contain the name of the resource package
- Updated the file downloader class to be able to get the resource package hash from the google code server
- Updated the file downloaded class to verify the resource package hash from the remote server at each startup to be able to perform automatic update
- Defined several JGE operation as static to clean up the wagic wrapper

projects/mtg/qml/QmlWagic/main.qml

@@ -5,28 +5,30 @@ Rectangle {
     id: main
     width: 480
     height: 272
-    state: "DOWNLOADING"
+    state: fileDownloader.state_string
     color: "black"
-    property url resource: "http://wagic.googlecode.com/files/core_017.zip"
-    property string hash: "cc6f9415f747acea500cdce190f0df6ee41db7cb"
 
     states: [
         State {
-            name: "DOWNLOADING"
-            when: (fileDownloader.hash != hash)
+            name: "DOWNLOADING_HASH"
+            PropertyChanges {
+                target: column1; visible: false
+            }
+            PropertyChanges {
+                target: wagic; visible: false
+            }
+        },
+        State {
+            name: "DOWNLOADING_FILE"
             PropertyChanges {
                 target: column1; visible: true
             }
             PropertyChanges {
                 target: wagic; visible: false
             }
-            PropertyChanges {
-                target:fileDownloader; url: resource
-            }
         },
         State {
-            name: "NORMAL"
-            when: (fileDownloader.hash == hash)
+            name: "DOWNLOADED"
             PropertyChanges {
                 target: column1; visible: false
             }

projects/mtg/qml/qmlapplicationviewer/qmlapplicationviewer.cpp

@@ -102,7 +102,11 @@ QmlApplicationViewer *QmlApplicationViewer::create()
 void QmlApplicationViewer::setMainQmlFile(const QString &file)
 {
     d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
+#ifndef Q_OS_ANDROID
     setSource(QUrl::fromLocalFile(d->mainQmlFile));
+#else
+    setSource(QUrl::fromLocalFile(file));
+#endif
 }
 
 void QmlApplicationViewer::addImportPath(const QString &path)
@@ -155,7 +159,7 @@ void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
 
 void QmlApplicationViewer::showExpanded()
 {
-#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
+#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR) || defined(Q_OS_ANDROID)
     showFullScreen();
 #elif defined(Q_WS_MAEMO_5)
     showMaximized();