feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
16,482 Commits 108 Branches 368 Tags
a9a5e3ea17945a3c6718e74c2dd07ce80df4e1f4
Commit Graph

341 Commits

Author SHA1 Message Date
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +01:00
Friedemann Kleint
808408eeea 10n: Fix tr() issues. 2011-01-19 16:50:03 +01:00
Tobias Hunger
1502c64ae4 Git: Some whitespace fixes 2011-01-12 16:32:47 +01:00
Tobias Hunger
bdfa995e0b Fix git show using the default format 
Fix git show using the default format the first time it gets used.

Task-number: QTCREATORBUG-3412
 2011-01-12 16:32:46 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Tobias Hunger
11e21e16c1 Git: Improve handling of git submodules 
Task-number: QTCREATORBUG-3390
 2010-12-20 10:24:35 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Tobias Hunger
e8c228b26c Git: Have version selection dialog default to HEAD 
... if a repository is set.
 2010-12-16 09:37:23 +01:00
Tobias Hunger
de2868d108 Git: Stop debug message 2010-12-09 16:41:35 +01:00
Tobias Hunger
d74f90b511 Git: Bring iexisting editors to foreground 
If we have some git operation in an editor already: Bring that to
the foreground.
 2010-12-09 16:41:34 +01:00
Tobias Hunger
827800c2c4 Git: Allow for pretty format selection in git show 
Allow for pretty format selection in git show.

Save selected value and default to "email".

Task-number: QTCREATORBUG-3341
 2010-12-09 16:41:32 +01:00
con
a9c803d310 Version bump. 2010-12-02 10:38:04 +01:00
con
c598118d5b Update the filter matches for the settings dialog. 
Task-number: QTCREATORBUG-2936
 2010-12-01 18:48:40 +01:00
Tobias Hunger
c6eb5538ca Git: Add some tooltips 
Add tooltips to the toggles found in the Git Blame and Diff editors.
 2010-11-26 13:42:54 +01:00
Tobias Hunger
d1976d1959 Git: Only enable submit button when a description is available 
Only enable submit button in the git submit editor when a non-empty
desciption of the patch is available. Git rejects empty commit messages
and old versions fail without even giving an error Qt Creator can detect,
so this should make commiting a bit more save.

Task-number: QTCREATORBUG-2410
 2010-11-23 16:01:48 +01:00
Tobias Hunger
2f07660e5b Git: Do not accept invalid commits 
Do not offer to commit in the dialog opened when closing the
commit editor when the commit is not containing all the required
information.
 2010-11-23 16:01:47 +01:00
Tobias Hunger
e151381a8a Git: Allow . in checkout pathes 
Task-number: QTCREATORBUG-3141
 2010-11-22 18:07:35 +01:00
Tobias Hunger
a13014eb4e Fix whitespace issue 2010-11-22 15:16:49 +01:00
Tobias Hunger
8808f0fa2d VCS: Handle code folding in diff view 
Allow to do codefolding on files and hunks in the diff editor
 2010-11-22 12:03:08 +01:00
Tobias Hunger
f84c228568 Git: Add options to diff editor 2010-11-22 12:03:07 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling 
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
 2010-11-17 13:19:07 +01:00
Friedemann Kleint
e2ec9b03f2 VCS[git]: Fix change dialog. 2010-11-15 12:07:10 +01:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build 
... instead of running a sed script over a lot of files on each
version increment.
 2010-11-03 17:47:41 +01:00
Oswald Buddenhagen
e160f071ce centralize addition of pluginspecs to OTHER_FILES 2010-11-03 17:47:41 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Tobias Hunger
7c36f47277 Git: Fix stash names 
Fix detection of stash names.

Task-number: QTCREATORBUG-2934
 2010-10-29 14:19:19 +02:00
Tobias Hunger
9dd9475e84 Git: Use class instead of struct 2010-10-29 14:19:18 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
Oswald Buddenhagen
ddf5a01a30 kill dead source string 2010-10-25 17:50:56 +02:00
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
 2010-10-18 20:59:12 +02:00
Tobias Hunger
11fb6d1c52 Git: Rename "reset" back to "undo uncomitted changes" 
Rename "Reset..." back to "Undo Uncommitted Changes..." to be more
in line with git gui as well as the file-based operations.

Reviewed-by: Leena Miettinen
 2010-10-15 18:02:47 +02:00
Tobias Hunger
e419119bb9 Git: Update string 
Refer to "blame", not "annotate" since that is what we call the
action elsewhere.

Reviewed-by: Leena Miettinen
 2010-10-15 18:02:46 +02:00
Daniel Molkentin
551ed8228c Git integration: Disambiguate precedence to silence gcc warning 
Reviewed-by: Tobias Hunger
 2010-10-15 13:18:06 +02:00
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
 2010-10-11 14:16:33 +02:00
Tobias Hunger
e78b8cf4cc VCS: String update 
String update as suggested by Leena.
 2010-10-08 14:30:33 +02:00
Tobias Hunger
eb9b15be8c Git: Clean up the menu of the git plugin 2010-10-08 14:30:32 +02:00
Tobias Hunger
9293ecabc3 Git: Show native pathes to repositories 2010-10-08 14:30:31 +02:00
Tobias Hunger
bb02af93dd Git: Consider new files a diff 
When checking for a difference and being asked to handle untracked
files: Actually consider the presence of untracked files a change.

Fixes git commit editor not coming up when there were no changes,
only additions of new files.
 2010-10-08 14:30:27 +02:00
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00
hjk
4f05687ed0 version bump: 2.0.91 -> 2.0.92 2010-10-07 15:05:56 +02:00
Tobias Hunger
e506bdba93 Git: Improve handling of author information 
Task-number: QTCREATORBUG-2610
Reviewed-by: Robert Loehning
 2010-10-05 17:40:04 +02:00
Tobias Hunger
13b442f289 Git: ignore spaces in diff 
Ignore spacing changes in diff (based on same setting as used to
ignore spacing in git blame).

Task-number: QTCREATORBUG-2526
 2010-10-05 12:30:24 +02:00
Tobias Hunger
6694994823 Git: Unbreak cloneing of non-default branches from local repos. 
Do not fail when cloning non-defautl branches from local repositories:
Branches do already exist in this case, so do not try to set them up
again.
 2010-10-05 11:28:37 +02:00
Tobias Hunger
cd6009c276 Git: Handle unusual HEADs 
Handle detached HEADs as well as cloning from repositories that default
to another branch but master. This is relevant when clonig local
repositories.

Reviewed-by: Friedemann Kleint
 2010-10-05 11:28:36 +02:00
Tobias Hunger
c9147b36e7 Git: Change mapping of repository to directory name 
Change the mapping of repository name to checkout directory name.
This should now work better with windows.
 2010-10-04 17:19:17 +02:00
Tobias Hunger
6b85c2d520 Polish the checkout wizard (base and git) 
* Polish the base checkout wizard
    * Make UI easier to grasp
    * Add tooltips explaining things

Task-number: QTCREATORBUG-2540
Reviewed-by: Robert Loehning
 2010-10-04 17:19:16 +02:00
dt
2ec3acaf4e Merge remote branch 'origin/2.1' 2010-10-04 16:15:57 +02:00