diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-13 13:37:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-13 13:37:37 +0100 |
| commit | c7fdb93865c373c2cd75580d57b90d4ec703c42e (patch) | |
| tree | d493895071dd1e99d8d9368bc665ddf1ad4fbb2a /src/plugins/git/gerrit | |
| parent | 89a6611e9e2470afd8e56271d2953a8466c9e625 (diff) | |
| parent | 6ffe04bc40568fe9f79e366e1773458f081944d3 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
Change-Id: I2445882a270731b866b04f28ff87d161224c539a
Diffstat (limited to 'src/plugins/git/gerrit')
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.ui | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gerrit/gerritpushdialog.ui b/src/plugins/git/gerrit/gerritpushdialog.ui index ff06a8da0f7..5b34b1c7763 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.ui +++ b/src/plugins/git/gerrit/gerritpushdialog.ui @@ -77,9 +77,9 @@ <item> <widget class="QCheckBox" name="draftCheckBox"> <property name="toolTip"> - <string>Checked - Mark change as private -Unchecked - Unmark change as private -Semi-checked - Do not change current state</string> + <string>Checked - Mark change as private. +Unchecked - Remove mark. +Partially checked - Do not change current state.</string> </property> <property name="text"> <string>&Draft/private</string> |