feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

2048 Commits

Author SHA1 Message Date
Orgad Shaneh
7ed1576083 Clean up single namespace forward-declarations 
Done using the following ruby script:

Dir.glob('**/*.h').each { |file|
  if File.file?(file)
    s = File.read(file)
    t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  end
}

Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-12 09:30:37 +01:00
Tobias Hunger
8c1c284789 Qbs/qmake: Fix dependencies of plugins 
... based on output from dependencyinfo.py script

Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-11 13:23:26 +01:00
Orgad Shaneh
1ed9f6bbca Git: Enable local branch selection in Push to Gerrit 
Show dialog even if there are no local commits in current branch

Change-Id: I11e0c6505981712df51bb33694a6cba9704d7324
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-11 12:06:29 +01:00
Orgad Shaneh
292e4599aa Git: Rename branch -> targetBranch in Push to Gerrit 
Change-Id: I725a7e9ece2bf1e8854dc077cb93a1f7cc1eb90c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-11 12:06:24 +01:00
Orgad Shaneh
517c357770 Git: Factorize ctor of Push to Gerrit 
Change-Id: Ib668d0e29bac25bc2f78d8885b4dfa89c292b489
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-11 12:06:19 +01:00
Orgad Shaneh
6db52645b9 Git: Silence rev-list execution 
It's plumbing. Not interesting for the user.

Change-Id: I65bb7849c64f32ac24684715290acf26441c5d2b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-11 12:06:12 +01:00
jkobus
7267c95acf Fix a crash on "Switch to Text Diff Editor" 
Task-number: QTCREATORBUG-11448

Change-Id: Id0239d5cf71ff857ac384e18136348df92a98b74
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-02-11 11:40:46 +01:00
Orgad Shaneh
346f0c3177 Git: Remove unused functions 
Change-Id: I279dcf1ee1c1fe16d3a1fd866af4f9cc4a8c9070
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-10 10:44:25 +01:00
Orgad Shaneh
757a5a2867 Git: Detect rc versions 
Rename local vars to avoid collision with macros defined in
<sys/sysmacros.h>

Change-Id: I6da7354102cca898d2600296242131e4c343c019
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-06 11:10:09 +01:00
Orgad Shaneh
92a133b09a Git: Increase limit in LogChangeDialog to 1000 entries 
Task-number: QTCREATORBUG-11200
Change-Id: Iff6073c4f84926a18006c1f47b30a0525134c2ba
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-02 06:44:34 +01:00
Jarek Kobus
edac8f082d Get rid of DiffShowEditor. 
Made DiffEditor customizable instead

Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 19:13:48 +01:00
Jarek Kobus
c18fa9112b Rename DiffEditorWidget -> SideBySideDiffEditorWidget 
It's the preparation for the new UnifiedDiffEditorWidget

Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-01-30 17:13:14 +01:00
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
Orgad Shaneh
25ddacc238 Git: Add using Git::Internal to GerritPushDialog 
Change-Id: I7b2dab05809040397c7221ed830730bc1c5a019d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-29 11:05:04 +01:00
Eike Ziller
3422995521 VCS editors: Fix revision markers 
Resets the revisions when setting the contents of text editor documents
in general.

Task-number: QTCREATORBUG-11356
Change-Id: I4069d629d8a612d42c7deae707300d50690e2db7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-29 10:04:47 +01:00
Petar Perisin
e163356f9f Git: Branches dialog - ensure all documents are saved 
Change-Id: Ia48157b10fb2f9eb3a8b9b8e7e541a736dd75b4f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-27 16:23:09 +01:00
Tobias Hunger
88a4421a84 DocumentManager: Refactor saveModified methods 
Introduce methods to save a document/list of documents/all documents,
both silently and with a dialog to the DocumentManager.

All of these return a bool that signifies whether the save was
successful or not.

Detailed information on which files failed to load or whether the
save was canceled by the user are still available as optional
in/out parameters.

Change-Id: Id17798302f2a8ba6b85a07c1f0b91f03b20da03f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-23 13:50:29 +01:00
Eike Ziller
cdd19fe6ad Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

Change-Id: If62ec06ea069a7eba6735101e5334b0c1f66861f
 2014-01-20 14:21:46 +01:00
Orgad Shaneh
7dc19b46ed Git: Set a title for change selection dialog 
Lost in 13a0b348b

Change-Id: Id798c849cd30c44db1e16d14ddfba4c78a77e2f2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-01-16 17:08:41 +01:00
jkobus
a74b59ffd6 Add DiffEditorController 
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-16 14:36:53 +01:00
Petar Perisin
f23922f84a Git: Added ability to checkout and reset in GitEditor 
Especially useful in reflog.

Change-Id: I1d63221f152ebc7e69934482785b433d016e4ead
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2014-01-16 00:54:22 +01:00
Petar Perisin
3a3dbb3746 Git: Fixed bug with branches missing from a list 
Change-Id: Id4fa9f6c4f874c9b1ac5112efceaf0c22ed84d00
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-01-16 00:52:54 +01:00
Petar Perisin
b245bfc65d Git: fix checkout in ChangeSelectionDialog 
Change-Id: I17f9d4926bb1fc0c075aa1b706f6fb65b463ab48
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2014-01-15 21:10:37 +01:00
Orgad Shaneh
5eff132253 Git: Pop stored stash after checkout 
Change-Id: I41eda91149c0152fd0b9f3d2c0294120153377b5
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2014-01-15 08:19:15 +01:00
Petar Perisin
27ce04bb5b Git: search for gitk in path if all else fails 
Change-Id: I4799791b2baffa61092c01699a4128f01151b53c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-01-14 18:13:34 +01:00
Orgad Shaneh
9ce8e85109 Git: add completion to ChangeSelectionDialog 
Change-Id: I4511c26af7b02fb0ffab76e5170e80d6cf79b10b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-14 11:31:01 +01:00
Orgad Shaneh
df9299fd24 Git: Do not hang on Continue Cherry-Pick/Revert 
...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-14 11:11:29 +01:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin 
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-14 07:43:00 +01:00
jkobus
1d954b1b2a Get rid of DiffEditor::editorWidget(); 
Change-Id: I3078002359871dad74d4a07924d5beeaeb9f82ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-01-13 13:32:10 +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
aeab5d9ab9 Git: Trim change on ChangeSelectionDialog 
When a ref is copied from an external source (e.g. gerrit), it might
includes a trailing whitespace.

Change-Id: I61305af27959f457795afa37654e683622d38259
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2014-01-07 14:42:36 +01:00
Orgad Shaneh
7073f7daed Git: Fix draft ref for gerrit 
Change-Id: I884bcab46a7e11cbc3ea6c453bddd8b9d599e4cc
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-31 15:10:08 +01:00
Orgad Shaneh
c17f798a01 Git: Do not invoke git for details about empty change 
Change-Id: I2a7b36063ad3c67d3a1fbe999659dc0051723b10
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-23 06:45:21 +01:00
Orgad Shaneh
ddfec003ad Revert "Git: add completion to ChangeSelectionDialog" 
Missing dependency

This reverts commit 724690132cf6d8fb812ea67e1665d7bbf7c5d290

Change-Id: Ib20b7bbd23b0a22e271006f951095d805e4639e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-22 08:47:06 +01:00
Orgad Shaneh
1f4587955d Git: add completion to ChangeSelectionDialog 
Change-Id: I0b693ec00008b9cd39e05148acc5441fed39a196
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-22 08:46:42 +01:00
jkobus
0d13028440 Refactor source property 
Get rid of source property out of DiffEditorWidget,
attach dynamic property when it's needed instead.

Change-Id: I6641a7b55c42b4eceba78c2e28f5140b40fe0fa5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-19 14:06:51 +01:00
Eike Ziller
1adab4c4cc Merge BaseTextEditorWidget::editorDocument() and ::baseTextDocument() 
Doesn't really make sense to have the additional IDocument *editorDocument()
method.

Change-Id: I0a7420eb1afaa76f63c3f7e9c4b373acf624ffb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-18 11:34:34 +01:00
Eike Ziller
deb43b4c8a Preferences: Add default implementation for filtering 
The default "matches" method now takes the widget and looks for all
child labels, checkboxes, push buttons and group boxes.
Because of that, the former "createWidget" method
can be called multiple times without creating a new widget
(-->widget()), and the "finished" method must ensure that the created
widget gets deleted, since not all widgets that were created are added
to the UI anymore.

Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-10 13:31:48 +01:00
Orgad Shaneh
4a5af14b7f Git: Enable choosing non-fast-forward merge 
Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-09 11:14:02 +01:00
Orgad Shaneh
f93d76294a Git: Improve Push to Gerrit icon 
Change-Id: I5ee6d308409eef60a240b89bb10ef35e2d5f1f62
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-06 12:12:56 +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
4845dc77ee Git: Wait with stashing on interactive rebase until user approves 
Change-Id: Ieb8d0cd0906cdf0ea7a37e60e92a263c359c7a41
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-12-05 12:34:42 +01:00
Eike Ziller
072d551c73 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
 2013-12-05 11:58:42 +01:00
Orgad Shaneh
0a71091260 Limit cdUp to root 
Task-number: QTCREATORBUG-10860

Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-12-03 14:42:07 +01:00
Orgad Shaneh
2d415c8228 Git: Use initStyleOption instead of setting options in paint 
Change-Id: Idc14c157478c7092fce7d688044cb0a99e47bebe
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2013-12-03 09:12:46 +01:00
Eike Ziller
0e4de8c108 Merge remote-tracking branch 'origin/3.0' 2013-11-29 11:50:41 +01:00
Friedemann Kleint
6ec8838f68 git: Suppress stderr when running diff on Windows. 
When using autocrlf, warnings
"LF will be replaced by CRLF in ..."
occur, causing the command window to pop up, which is not
desired.

Change-Id: I399080a98f9386dbbaff2c90c6d4ba4877d08057
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-11-28 13:41:52 +01:00
Friedemann Kleint
6c02c27e9e Change GitClient::executeGit() to take flags instead of bool. 
Change-Id: I3cb83914be7e9665f49baf9f563c753c6c3919f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-11-28 13:25:45 +01:00
Tobias Hunger
37ae76ac18 Git: Add history completer to path choosers 
Change-Id: I90a45dccb21963a24e338880a0b3677bb5dbf8e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-11-26 11:28:53 +01:00