X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fgenversion.cpp;h=f0f746bb05885c09d5bc7b00e9917ce9e29f98ab;hp=904e9718415f991b6b52829d9b2df4c0fa66cb18;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hpb=f8a3a06fef833858bd93f8441d56a29b82d9bade

diff --git a/src/common/genversion.cpp b/src/common/genversion.cpp
index 904e9718..f0f746bb 100644
--- a/src/common/genversion.cpp
+++ b/src/common/genversion.cpp
@@ -44,19 +44,31 @@ int main(int argc, char **argv) {
     // try to execute git-describe to get a version string
     QProcess git;
     git.setWorkingDirectory(gitroot);
+    #ifdef Q_OS_WIN
+    git.start("cmd.exe", QStringList() << "/C" << "git" << "describe" << "--long");
+    #else
     git.start("git", QStringList() << "describe" << "--long");
+    #endif
     if(git.waitForFinished(10000)) {
       QString descr = git.readAllStandardOutput().trimmed();
       if(!descr.isEmpty() && !descr.contains("fatal")) {
         // seems we have a valid git describe string
         descrver = descr;
         // check if the workdir is dirty
+        #ifdef Q_OS_WIN
+        git.start("cmd.exe", QStringList() << "/C" << "git" << "diff-index" << "--name-only" << "HEAD");
+        #else
         git.start("git", QStringList() << "diff-index" << "--name-only" << "HEAD");
+        #endif
         if(git.waitForFinished(10000)) {
           if(!git.readAllStandardOutput().isEmpty()) dirty = "*";
         }
         // get a full committish
+        #ifdef Q_OS_WIN
+        git.start("cmd.exe", QStringList() << "/C" << "git" << "rev-parse" << "HEAD");
+        #else
         git.start("git", QStringList() << "rev-parse" << "HEAD");
+        #endif
         if(git.waitForFinished(10000)) {
           committish = git.readAllStandardOutput().trimmed();
         }
@@ -113,6 +125,7 @@ int main(int argc, char **argv) {
   QByteArray oldContents = gen.readAll();
   if(oldContents != contents) { // only touch the file if something changed
     gen.seek(0);
+    gen.resize(0);
     gen.write(contents);
     gen.waitForBytesWritten(10000);
   }