Merge branch 'stable' into dev

* stable:
  Check git hash/tag only if we are in git repo
  Sync filesystems after modification
  Change copyright to 2014

Change-Id: I9cc9f9f1f6dcf8d2e7ba68e1c6bffc78b1a6987d

Author: Kalle Viironen

appcontroller.pro

@@ -17,13 +17,15 @@ android {
 INSTALLS+=target
 
 # Find out git hash
-unix:system(which git):HAS_GIT=TRUE
-win32:system(where git.exe):HAS_GIT=TRUE
-contains(HAS_GIT, TRUE) {
-    GIT_HASH=$$system(git log -1 --format=%H)
-    !system(git diff-index --quiet HEAD): GIT_HASH="$$GIT_HASH-dirty"
-    GIT_VERSION=$$system(git describe --tags --exact-match)
-    isEmpty(GIT_VERSION) : GIT_VERSION="unknown"
+exists(.git) {
+    unix:system(which git):HAS_GIT=TRUE
+    win32:system(where git.exe):HAS_GIT=TRUE
+    contains(HAS_GIT, TRUE) {
+        GIT_HASH=$$system(git log -1 --format=%H)
+        !system(git diff-index --quiet HEAD): GIT_HASH="$$GIT_HASH-dirty"
+        GIT_VERSION=$$system(git describe --tags --exact-match)
+        isEmpty(GIT_VERSION) : GIT_VERSION="unknown"
+    }
 } else {
     GIT_HASH="unknown"
     GIT_VERSION="unknown"

main.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **
@@ -187,6 +187,7 @@ static bool removeDefault()
             fprintf(stderr, "Could not remove default application.\n");
             return false;
         }
+        sync();
     }
     return true;
 }
@@ -207,6 +208,7 @@ static bool makeDefault(const QString &filepath)
         fprintf(stderr, "Could not link default application.\n");
         return false;
     }
+    sync();
     return true;
 }
 

portlist.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **

portlist.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **

process.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **

process.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use contact form at http://qt.digia.com
 **