feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,972 Commits 108 Branches 368 Tags
35bc86d1a705cc09c645c4c960b0badf5a674d53
Commit Graph

76 Commits

Author SHA1 Message Date
Orgad Shaneh
aa6dd83e08 Git: Replace bool argument with flags 
For a start, it's a single flag. Will be extended.

Also change the default for includeRemotes to false (most callers pass false)

Change-Id: I969f89a06b85a42c134c0232d2947d58fe19ea0d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-29 11:05:13 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Orgad Shaneh
0d37b5453d Git: Fix soft assertion 
First selectionChanged when dialog is opened always has empty index for
previous.

Change-Id: I024374f9e61fffae351f15af54f769ddf84ded75
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-05 12:34:43 +01:00
Orgad Shaneh
9ef8d71e2c Git: Indicate affected commits for range operations 
* Reset: Strikethrough discarded commits
* Interactive Rebase: Mark included commits
* Push to Gerrit: Mark pushed commits

Change-Id: I5599a72055fd94b88c55b74b3a1116c07e35c113
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-17 16:39:08 +02:00
Orgad Shaneh
a5c970bea2 Git: Rename widget member to m_widget 
Follow coding style

Change-Id: I9583cdfc7ec32140614beb8684d3f15344fa7135
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-10-16 09:01:08 +02:00
Orgad Shaneh
41b51ff67f Git: Preserve reset type 
Task-number: QTCREATORBUG-9666
Change-Id: I364bc0eefef376a9a14953b259e9d7b2eb29c228
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-09 12:00:07 +02:00
Orgad Shaneh
a6626b49c4 Git: Reorder reset types 
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>
 2013-07-06 20:18:52 +02:00
Orgad Shaneh
a26c884b70 Git: Preserve current selection on log change refresh 
Change-Id: Ic6be652a1d5cca87ae5effdcb3cb5df7b1b73c2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 16:57:43 +02:00
Orgad Shaneh
1f447715b0 Git: Remove double warning for gerrit push 
Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:43:54 +02:00
Orgad Shaneh
bcd8c02aea Git: Prevent or close fixup editor if no local commits are found 
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-03 10:36:22 +02:00
Orgad Shaneh
f3eedaf300 Git: Warn when commits are not found 
Change-Id: I5e03853f0b658d7f246538ca90e35f38cc2f49d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-31 14:44:46 +02:00
Orgad Shaneh
566d3d9d9b Git: Enable commit selection in Push to Gerrit dialog 
Change-Id: Ie0ca8322858ac75d4bacf8b3efe66fa40577e3a2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-05-07 11:50:51 +02:00
Orgad Shaneh
c45e4e614a Git: Do not return empty string for top commit in LogChangeDialog 
Change-Id: I26cff005974102c037bbbff04b7606e7f8a07b84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-06 10:54:45 +02:00
Orgad Shaneh
325c0beda5 Git: Show commit on double-click in fixup editor 
Change-Id: I8cb08b0fcba3ddac7223b39b3762ff71e8d61f8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-06 10:25:10 +02:00
Orgad Shaneh
aa5b049561 Git: Improve LogChangeWidget 
* Enable display of local-only commits
* Enable specifying a top commit

Change-Id: I0688ba9ac670f709d2044ae2b7bff081fd86c860
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 20:01:23 +02:00
Orgad Shaneh
c702639a8e Git: Factor out the central widget from LogChangeDialog 
To be used for "amend previous commit" feature

Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 14:38:05 +02:00
Petar Perisin
f4eabcfa0e Git - ChangeSelectionDialog select from recent history 
Change-Id: Ib87f9bd997a5c7c07abfd56a05d9e454c1a9ea93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 13:37:05 +02:00
Orgad Shaneh
5383c4581c Git: Use bold instead of italic for decorated commits 
Italic is harder to read, especially when there are many of them

Change-Id: I15bf054356a996308820e5c7969041933aeb538a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-29 12:38:04 +02:00
Orgad Shaneh
f1a622a779 LogChangeDialog: Show 40 entries 
Change-Id: I96c41cac8426c7de65671c787691ad302fe77ded
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-29 12:34:04 +02:00
Petar Perisin
81f62d3673 Git - use proper label text in LogChangeDialog 
Change-Id: Ie0b9f06f411308e93dc29aa7025a960fc640a359
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-29 00:33:29 +02:00
Orgad Shaneh
5658eb69aa Git: Add Mixed reset (as default) 
This is the default in Git

Change-Id: I65b5c0003a731799812d143d3142b58b30ddb878
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-19 14:12:36 +02:00
Orgad Shaneh
e6da908321 Git: Refactor reset 
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-19 14:12:25 +02:00
Friedemann Kleint
9393335c1d Clean headers in Git. 
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 15:10:02 +02:00
Orgad Shaneh
6275308f63 Git: Externally set dialog title for LogChangeDialog 
Change-Id: I5869e17145f9974eb274d4300bbb23ebdc0990f0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:24:28 +01:00
Orgad Shaneh
15374275a1 Git: Rename ResetDialog -> LogChangeDialog 
Required for interactive rebase

Change-Id: I024505bbde1c58a7ccb4ce931322e0f5b467552b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:24:07 +01:00