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

6 files changed, 16 insertions, 12 deletions

diff --git a/appcontroller.pro b/appcontroller.pro
index ac7eb83..b467652 100644
--- a/appcontroller.pro
+++ b/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"
diff --git a/main.cpp b/main.cpp
index a1e0157..676b4ab 100644
--- a/main.cpp
+++ b/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;
 }
 
diff --git a/portlist.cpp b/portlist.cpp
index a7fbd97..e0258c9 100644
--- a/portlist.cpp
+++ b/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
 **
diff --git a/portlist.h b/portlist.h
index 0761c62..4846bf0 100644
--- a/portlist.h
+++ b/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
 **
diff --git a/process.cpp b/process.cpp
index 0f7d404..32ad853 100644
--- a/process.cpp
+++ b/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
 **
diff --git a/process.h b/process.h
index bacfc41..290fde4 100644
--- a/process.h
+++ b/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
 **