Merge commit 'origin/1.2'

2009-06-16 14:58:28 +02:00
parent 7594cc5a41 aa2836f1dc
commit 4f4f767b2b
19 changed files with 18612 additions and 4846 deletions
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -546,7 +546,13 @@ bool GitClient::synchronousGit(const QString &workingDirectory,
        environment.set(QLatin1String("PATH"), m_settings.path);
    process.setEnvironment(environment.toStringList());

-    process.start(m_binaryPath, arguments);
+#ifdef Q_OS_WIN
+        QStringList args;
+        args << "/c" << m_binaryPath << arguments;
+        process.start(QLatin1String("cmd.exe"), args);
+#else
+        process.start(m_binaryPath, arguments);
+#endif
    process.closeWriteChannel();

    if (!process.waitForFinished()) {