Fixed android compilation.

Version bump. Fixed file size problem under windows. Updated changelog.
2014-06-28 00:26:14 -04:30
parent ce9353e4f3
commit 36a91d78aa
15 changed files with 326 additions and 210 deletions
--- 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
 }