feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,671 Commits 108 Branches 368 Tags
ccffed93854d506a4fb57c933415872c1424e81c
Commit Graph

468 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
a1e11f69a9 fakevim: Enforce use of RealControlModifier by breaking the compilation otherwise 2011-04-08 11:19:22 +02:00
hjk
d8b6837b45 fakevim: Try to fix Ctrl on Mac. Again. 
How clever can "clever default behaviour" get before it turns unclever...
 2011-04-07 18:00:46 +02:00
hjk
54eac56c00 fakevim: support snippets, by doing nothing. 
Reviewed-by: con
Task-number: QTCREATORBUG-4379
 2011-04-06 14:56:25 +02:00
hjk
e1ba3d0b89 fakevim: allow main texteditor to call into fakevim 2011-04-05 17:08:19 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
 2011-04-01 09:53:09 +02:00
con
e849fb6c3f FakeVim: Fix Ctrl+ shortcuts on Mac. 
Wouldn't work if there also was a non-ctrl shortcut for the same key.

Task-number: QTCREATORBUG-3928
Reviewed-by: hjk
 2011-03-31 10:17:02 +02:00
Krzysztof Szatan
66780b845e fakevim: fix paste/yank/delete on last line 
Merge-request: 282
Reviewed-by: hjk <qtc-committer@nokia.com>
 2011-03-28 14:45:33 +02:00
hjk
34a96d8808 debugger: add manual test for (too) long evaluation 2011-03-28 13:24:47 +02:00
hjk
41a558643d fakevim: update search history after <Esc> in incremental search 2011-03-28 11:18:56 +02:00
hjk
2a3f0f315a fakevim: fix :s, :d, :>, and :< in case of empty line specs 2011-03-28 10:45:47 +02:00
hjk
e78427b7fe fakevim: prevent endless loop when highlighting search results for $ 2011-03-02 11:49:57 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
hjk
7a35865c50 fix a few krazy warnings 2011-02-23 17:38:26 +01:00
hjk
77fba3205e fakevim: work on 'dumb' completion 2011-02-18 15:44:16 +01:00
hjk
c1405e384c fakevim: remove dead code 2011-01-12 11:29:26 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
hjk
e9f5bb8d77 fakevim: implement 's' in visual block mode 
Cursor positioning after the operation is wrong, but bearable.
 2010-12-21 15:15:47 +01:00
hjk
6159e5b860 fakevim: start with work on Ctrl-N/Ctrl-P 2010-12-21 12:30:50 +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
Arvid Ephraim Picciani
a2459e0abe fakevim: Fix cursor movement in insert mode on Mac. 
Reviewed-by: hjk
(cherry picked from commit 51c8491158)
 2010-12-13 16:50:44 +01:00
Tobias Hunger
cf3a418cd8 Fix spelling in comments 
Krazy was complaining about those.
 2010-11-03 12:45:34 +01:00
Arvid Ephraim Picciani
51c8491158 fakevim: Fix cursor movement in insert mode on Mac. 
Reviewed-by: hjk
 2010-11-02 12:37:36 +01:00
Martin Aumüller
893f5bfd23 fakevim: don't swap cmd and ctrl keys on os x 
qt reversed the mapping of cmd and ctrl internally, this should be re-reversed in vi

Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-10-26 10:56:32 +02:00
Martin Aumüller
9f99bdb6f1 fakevim: fixes for search using Core find dialog 
- repeated searching ('n'/'N') would not work
- search would have been restricted to selection
- fix search when used as motion in an edit command ('c/...')

Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-10-26 10:56:32 +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
hjk
da91600bf4 fakevim: fix 'Delete' in insert mode to delete exactly one char again 
Reviewed-by: Kornelia Poenitz
 2010-10-11 11:54:00 +02:00
Adrien Bustany
6371d2835d FakeVim: Allow ctrl+left/right to move word-wise in insert mode 
Merge-request: 185
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-10-08 12:51:19 +02:00
Adrien Bustany
e3a5ff16f7 FakeVim: add ctrl-w in insert mode 
Merge-request: 185
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-10-08 12:51:19 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
 2010-10-04 16:07:46 +02:00
hjk
77259d1d38 fakevim: reset op count when leaving insert mode 
Reviewed-by: Alessandro Portale
Task-number: QTCREATORBUG-2552
 2010-10-01 18:43:01 +02:00
hjk
a75758f082 fakevim: next attempt at fixing QTCREATORBUG-1263 
AltGr + 4 on Swedish keyboards on Vista
 2010-09-30 11:58:22 +02:00
hjk
32a54bbc3d fakevim: use more of base text's cursor handling 
Done with mae.
 2010-09-29 10:53:49 +02:00
hjk
f5258cbc13 fakevim: disable Shift-Up style keyboard selection in insert mode. 2010-09-27 15:38:17 +02:00
hjk
65c5a84e45 fakevim: fix anchor setting after % 2010-09-27 15:25:18 +02:00
hjk
74cf70deaf fakevim: add an option to pass Control + <x> directly to Creator core 
Original code by dcarr.
 2010-09-24 13:05:15 +02:00
hjk
3ba4812749 fakevim: disable completion on each keystroke. 
This has bad interaction with '.' and ESC.
 2010-09-21 16:33:14 +02:00
hjk
3d36ece27b fakevim: fake tab completion 2010-09-21 16:33:14 +02:00
hjk
8016e96bec fakevim: bind automatic code completion to InsertMode 2010-09-17 08:56:16 +02:00
hjk
c9395b45a2 fakevim: fix 'O' 2010-09-16 16:56:25 +02:00
hjk
3c1dbd53ca fakevim: fix anchor positioning in insert mode 2010-09-16 16:56:25 +02:00
hjk
dcef626416 fakevim: co-operate with code completion again 2010-09-16 15:28:51 +02:00
hjk
5b403c376f fakevim: fix '#' 2010-09-16 14:32:41 +02:00
hjk
2e02f4cb27 fakevim: fix backspace at start of line in insert mode 2010-09-15 19:02:35 +02:00
hjk
02966feab6 fakevim: handle editors that get removed during execution of a command 2010-09-15 16:19:57 +02:00
hjk
59a341d650 fakevim: use QTextCursor for fakevim marks 2010-09-15 13:48:11 +02:00
hjk
9fc20bf7a8 fakevim: fix 'o' 2010-09-14 18:49:59 +02:00