Hard is now the default (as it is in 2.7), and the types are
properly ordered
Task-number: QTCREATORBUG-9733
Change-Id: I54fb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
If directory is empty, buttons remains NULL, which leads to a crash
To reproduce, open Branches dialog then close all editors
and projects and click Log for a branch
Change-Id: Icf06b76c58585c0dd6062017e94e07dad016c275
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."
Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
The (un)expectDirectoryChange API addition has been reverted
Change-Id: I4736f51a77eb2f63b3e4a7b44426ad15a06624c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
+ Get rid of a workaround done for retrieving sha
Change-Id: I4b7a6c6d9e9be5766f4fc540dc8b15037eb7948c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Rebase --continue might request an editor, which hangs if run
synchronously
Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Calling setExpectChanges after execute is too late
Change-Id: I852c224206fcd758943252029b8e9b050920ca5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
The Gerrit dialog itself was missing while Push to Gerrit was already
there.
Change-Id: Ie4b85cad9dba96beafb595c505daf28d0a1ceeb5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
expectDirectoryChange is called by ConflictHandler. After the command
is executed it is too late
Change-Id: I27e82fd2a979a043932b4a838f3736cbe0f60107
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This dialog was before, in QtCreator 2.7, used only for show. It was in
main git menu, and available always. Although a lot of new options were
added to the dialog, I think it is good to get it back to where it was
before, so that 2.7 users can find it easier.
Also, I prefer this location for it, since it is easier to access here.
Change-Id: I510ab0efb081194e70f6297125012034103e13e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* git rev-parse --show-toplevel doesn't work inside git dir.
* Only "Describe (show)" should be available for those files. show
works when running from inside the git dir
Change-Id: If5f3d1af8da2f8d149ac1e03ffd70b530e609557
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
These editors are usually opened when a process is in progress, so
it doesn't make sense to allow reverting or cherry-picking for them
Change-Id: I6f238ef973be86d07d2646bcea969f9aa2742b9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
These nicely show up in the project tree in Qt Creator then.
Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
However, files need to be part of the current project to be added to the
list.
Task-number: QTCREATORBUG-9153
Change-Id: Ifb7a4684e85d0ccd688956eeff77b4cc7d807911
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
The message in stashPrompt doesn't make sense with an inner directory
Change-Id: Iddbea519915cd22a6882dcafb705d1ed99106db6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
