2481e71d18
Vcs: Move editor construction over to new scheme
...
Change-Id: I491b9f37bfe15ebc800fedd5c683bfaf24e63889
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
2014-08-21 11:50:27 +02:00
49b5502a18
GitEditor: Rename GitEditor into GitEditorWidget
...
This makes it consistent with the BaseText terminonlogy
Change-Id: I4073169a19eaa75df7a29f96d74a85ab96bc352d
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-07-28 10:38:19 +02:00
a0c7b208cc
Git: Factor source directory resolving to a function
...
Change-Id: Ica2f6ad01052fb7130397740fcf2396de7cbbf9d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-07-03 10:46:39 +02:00
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
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
5e585b9eee
Git: Support annotate revision for renamed files
...
Change-Id: I6993cdd6f91f29b6f4e990cc5ba332ff63f7ed9f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-10-10 19:00:01 +02:00
367cfc8419
Git: Support staging a single chunk.
...
Add context menu in diff editor to stage/unstage a single chunk from the diff.
Task-number: QTCREATORBUG-5875
Change-Id: Ic244a0d84b5ed5f66b90d7fe8784fc1b8041d183
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-09-26 23:10:59 +02:00
e8801167aa
Add common interface for text formats inside syntax highlighter
...
Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com >
2013-08-26 13:39:40 +02:00
6b8c93637b
VCS: Un-data functions that accept QString
...
Change-Id: Iffa82f4ab06162ab57e77301e77fb37ed7230bd5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-31 11:23:00 +02:00
0c50c5a1d3
VCS: Consolidate codec handling
...
Change-Id: I2c9a5031b63f0bc3e884739be680d051d7cf1ab4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-07-19 13:56:34 +02:00
05a6fc48ba
Git: Support change links on commit editor
...
Useful for commit messages with "reverts <hash>" for example.
Can later be extended for interactive rebase
Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-31 14:53:02 +02:00
7bfaf7a946
Git: Provide a commit editor for files opened externally
...
Change-Id: I52fccf36cca032dda36102d4be2654eb7461de64
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-24 12:29:49 +02:00
89e0a66f74
Git: Recognize SHA1s from 7 to 40 digits.
...
Qt's grafts have 9-digit SHA1s which did not work
with the previous 7-8/40 character limits.
Change-Id: I3989405d00b575a6efb7dc6a467cbb24df9f3db5
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-03-19 16:35:33 +01:00
1fda2111d4
Merge remote-tracking branch 'origin/2.6'
...
Conflicts:
src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
src/plugins/debugger/qtmessageloghandler.cpp
src/plugins/debugger/qtmessagelogwindow.cpp
src/plugins/madde/maemodeployconfigurationwidget.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
src/plugins/qmldesigner/designercore/include/widgetqueryview.h
src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qnx/bardescriptormagicmatcher.h
src/plugins/qt4projectmanager/profilekeywords.cpp
src/plugins/remotelinux/deployablefilesperprofile.cpp
src/plugins/remotelinux/deployablefilesperprofile.h
src/plugins/remotelinux/deploymentinfo.cpp
src/plugins/remotelinux/deploymentsettingsassistant.cpp
src/plugins/remotelinux/profilesupdatedialog.cpp
tests/auto/icheckbuild/ichecklib.cpp
tests/auto/icheckbuild/parsemanager.cpp
tests/auto/icheckbuild/parsemanager.h
Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
8f4817152c
Git: Add subject to log combobox
...
Change-Id: Icb76ad1c0783615172d929e8cf402feaffaddbdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-30 10:26:58 +01:00
298531e370
Incremented year in copyright info
...
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-01-29 16:27:03 +01:00
b53d398e2c
Git: Add context-menu actions for cherry-pick and revert
...
Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-23 18:50:45 +01:00
7b39f41c05
VCS: Refactor fileNameFromDiffSpecification
...
Use diff file pattern to match file name. Avoid duplication.
Include unit tests for Git
Change-Id: Ib68a08368270a27976a3e16bdd1cb219a52b8889
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-21 12:19:55 +01:00
725ecc5f91
VCS: Refactor createDiffHighlighter
...
All plugins do the same...
Change-Id: I21e5a1d7507292add91199a3db75df74165b63b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-18 12:43:22 +01:00
3a5eea88be
GitEditor: Remove superfluous "virtual"s
...
Change-Id: I6d4c25362e8805bcdcf6fdce82c587f6940a2142
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-14 15:46:57 +01:00
386ca7c8dd
Adjust license headers
...
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2012-10-05 17:12:56 +02:00
12a99d476c
Git: Do not display invalid commit as blame candidate
...
Change-Id: Ia08775b2e4364f405d223a9b49971ae70c04965a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-07-26 20:57:45 +02:00
e0e8cf3ada
Contact -> qt-project.org
...
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2012-07-19 13:23:21 +02:00
3c342a49dc
VCS: Add 'Blame current revision' in blame context menu
...
Internal change: added decorateVersion() function for decorating
a revision. This is called for both the current version and previous ones
Change-Id: I8b23fd628c9db01b005c19d46580979c5a21c687
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-06-04 11:34:24 +02:00
fb9146a9c3
Compile after qt5/qtbase commit 75a0c7f9
...
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.
Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-04-30 14:32:08 +02:00
4b366303e6
VCS: Make dark color schemes work with annotation highlighter
...
Task-number: QTCREATORBUG-6257
Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-03-06 14:34:01 +01:00
3fa55b7ab9
Removed module names from #include directives.
...
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2012-02-15 16:24:46 +01:00
2931a499e6
Long live the king!
...
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com >
2012-01-26 19:55:36 +01:00
6681d3edee
vcs: s/VCS/Vcs/
...
According to style guide.
Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com >
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com >
2012-01-09 10:55:41 +01:00
31600758de
all: s/info@qt.nokia.com/qt-info@nokia.com/
...
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com >
2011-11-03 10:33:19 +01:00
aa2acec14c
Fix/add copyright headers
...
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
8397663964
Update license.
2011-04-13 11:49:28 +02:00
f576ad9f2c
texteditor: merge ITextEditable into ITextEditor
...
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
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
04e32b0049
License headers.
2010-12-17 16:03:42 +01:00
f84c228568
Git: Add options to diff editor
2010-11-22 12:03:07 +01:00
bcd020f382
VCS[git]: Introduce optional pull --rebase.
...
Do 'git rebase --abort' if something fails.
2010-03-19 16:07:34 +01:00
9595504bda
Long live the king!
2010-03-05 11:28:13 +01:00
bcba9ea604
VCS [git]: Annotate previous version/single filelog annotation.
...
Task-number: QTCREATORBUG-503
2010-01-07 17:29:14 +01:00
9d4aafebac
VCS/git: Make blame go to current editor line
...
using queued slot/variant cookie magic in command
2009-10-01 17:50:24 +02:00
93cbef8724
long live the king
2009-08-14 09:30:56 +02:00
41a9395d21
Optionally shorten git blame output by removing date+line number.
2009-07-15 15:18:03 +02:00
884b7af769
Update license headers and sales contact details.
...
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
8ca887aae2
Fixes: change file license headers to include LGPL
2009-02-25 09:15:00 +01:00
59affcfffc
Bump year in licence header.
2009-01-13 19:22:14 +01:00
da3cb14483
chancge Nokia GPL exception version from 1.2 to 1.3
2008-12-16 17:20:00 +01:00
df7aacd637
more file cosmetics
2008-12-02 15:08:31 +01:00
ab83dcd87c
off-by-one in headers
2008-12-02 14:20:25 +01:00
8a43d9b9f3
end-of-line whitespace correction of the new headers
2008-12-02 14:17:16 +01:00
hjk
Orgad Shaneh
Petar Perisin
Robert Loehning
Francois Ferrand
jkobus
Friedemann Kleint
Oswald Buddenhagen
hjk
Orgad Shaneh
Eike Ziller
Bradley T. Hughes
Tobias Hunger
Erik Verbruggen
hjk
Friedemann Kleint
Jason McDonald
Daniel Molkentin
hjk