Fixed android compilation.

Version bump. Fixed file size problem under windows. Updated changelog.
codestation · Jun 28, 2014 · 36a91d7 · 36a91d7
1 parent ce9353e
commit 36a91d7
Show file tree

Hide file tree

Showing 15 changed files with 308 additions and 192 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+qcma (0.3.3) unstable; urgency=low
+
+  * Fixed wrong file sizes under windows.
+  * Fixed compilation with android toolchain.
+
+ -- codestation <[email protected]>  Thu, 28 Jun 2014 00:00:00 -0000
+
 qcma (0.3.2) unstable; urgency=low
 
   * Fixed bug with PSP savedata transfer.

diff --git a/qcma.pro b/qcma.pro
@@ -5,10 +5,15 @@
 #-------------------------------------------------
 
 TEMPLATE = subdirs
-SUBDIRS = qcma_gui.pro
+
+android {
+    SUBDIRS = qcma_android.pro
+} else {
+    SUBDIRS = qcma_gui.pro
+}
 
 # Compile the headless binary only on Linux because it depends on dbus
-unix:!macx {
+unix:!macx:!android {
     SUBDIRS += qcma_cli.pro
 }
 

diff --git a/qcma_cli.pro b/qcma_cli.pro
@@ -1,6 +1,6 @@
 include(qcma_common.pri)
 
-QT += dbus
+unix:!macx:QT += dbus
 
 TARGET = qcma_cli
 

diff --git a/qcma_common.pri b/qcma_common.pri
@@ -6,7 +6,7 @@
 
 QT += core network sql
 
-VERSION = 0.3.2
+VERSION = 0.3.3
 
 TEMPLATE = app
 
@@ -51,7 +51,7 @@ OTHER_FILES += \
     qcma.rc
 
 INCLUDEPATH += src/
-
+QT_CONFIG -= no-pkg-config
 RESOURCES += qcmares.qrc translations.qrc
 
 # find packages using pkg-config

diff --git a/rpmbuild/qcma-fedora.spec b/rpmbuild/qcma-fedora.spec
@@ -6,7 +6,7 @@ Name:           qcma
 Summary:        PSVita Content Manager Assistant
 License:        GPL-3.0
 Release:        1
-Version:        0.3.2
+Version:        0.3.3
 URL:            https://github.com/codestation/qcma
 Source:         https://github.com/codestation/qcma.git
 Group:          Productivity/File utilities

diff --git a/rpmbuild/qcma-openSUSE.spec b/rpmbuild/qcma-openSUSE.spec
@@ -6,7 +6,7 @@ Name:           qcma
 Summary:        PSVita Content Manager Assistant
 License:        GPL-3.0
 Release:        1
-Version:        0.3.2
+Version:        0.3.3
 URL:            https://github.com/codestation/qcma
 Source:         https://github.com/codestation/qcma.git
 Group:          Productivity/File utilities

diff --git a/src/androidmessage.cpp b/src/androidmessage.cpp
diff --git a/src/androidmessage.h b/src/androidmessage.h
diff --git a/src/cmaevent.cpp b/src/cmaevent.cpp
@@ -452,7 +452,7 @@ void CmaEvent::vitaEventSendObject(vita_event_t *event, int eventId)
     quint32 handle;
 
     do {
-        unsigned long len = metadata->size;
+        quint64 len = metadata->size;
         m_file = new QFile(m_db->getAbsolutePath(metadata->ohfi));
 
         // read the file to send if it's not a directory
@@ -477,7 +477,7 @@ void CmaEvent::vitaEventSendObject(vita_event_t *event, int eventId)
         }
 
         // send the data over
-        qDebug("Sending %s of %lu bytes to device", metadata->name, len);
+        qDebug("Sending %s of %llu bytes to device", metadata->name, len);
         qDebug("OHFI %d with handle 0x%08X", metadata->ohfi, parentHandle);
 
         VitaMTP_RegisterCancelEventId(eventId);

diff --git a/src/cmaobject.cpp b/src/cmaobject.cpp
@@ -186,7 +186,6 @@ void CMAObject::updateObjectSize(qint64 size)
     if(parent) {
         parent->updateObjectSize(size);
     }
-    //FIXME: size should be quint64
     metadata.size += size;
 }
 

diff --git a/src/cmautils.cpp b/src/cmautils.cpp
@@ -27,14 +27,11 @@
 
 #ifdef Q_OS_WIN32
 #include <windows.h>
-#else
-#ifndef __ANDROID__
-#include <sys/statvfs.h>
-#else
+#elif defined Q_OS_ANDROID
 #include <sys/vfs.h>
 #define statvfs statfs
-#define fstatvfs fstatfs
-#endif
+#else
+#include <sys/statvfs.h>
 #endif
 
 bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total)