summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitutils.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-02-02 12:27:05 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-02-02 12:27:05 +0100
commit9b76c068f97b200b814157f2aca2d880f7ad86f3 (patch)
treeac50ef9456bcc0c0dc5664013c6acfc23f8eaebb /src/plugins/git/gitutils.h
parent3d8b6845a39ab5ceb709c9e98241362c78a6ac3e (diff)
downloadqt-creator-9b76c068f97b200b814157f2aca2d880f7ad86f3.tar.gz
VCS[git]: Implement add using '--intent-to-add' depending on version.
Implement IVersionControl::vcsAdd() using --intent-to-add with a cached version check. On this occasion, implement vcsDelete() as well using 'git rm -f'.
Diffstat (limited to 'src/plugins/git/gitutils.h')
-rw-r--r--src/plugins/git/gitutils.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/git/gitutils.h b/src/plugins/git/gitutils.h
index 16d80ca656..7dbefc9158 100644
--- a/src/plugins/git/gitutils.h
+++ b/src/plugins/git/gitutils.h
@@ -54,6 +54,12 @@ QDebug operator<<(QDebug d, const Stash &);
// Make QInputDialog play nicely
bool inputText(QWidget *parent, const QString &title, const QString &prompt, QString *s);
+// Version information following Qt convention
+inline unsigned version(unsigned major, unsigned minor, unsigned patch)
+{
+ return (major << 16) + (minor << 8) + patch;
+}
+
} // namespace Internal
} // namespace Git