feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,779 Commits 108 Branches 368 Tags
6a337561c5336f638fe8dbed2a54e7c1bb8fde8d
Commit Graph

45 Commits

Author SHA1 Message Date
Orgad Shaneh
6a337561c5 Git: Show Precedes/Follows tags on Show editor 
Known limitation: Commit that has a tag shows its own tag on Precedes
field

Change-Id: I533e48b4bb5d57809d8e9f12fa7db5d8706f7372
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 12:03:43 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Orgad Shaneh
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
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Orgad Shaneh
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
Tobias Hunger
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
Erik Verbruggen
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
Tobias Hunger
d955d873b4 Git: Show deleted files in diff file combobox 
Task-number: QTCREATORBUG-6886

Change-Id: I99e076d9881bead58cbcb9c66f3e5ab1d1187b6f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 15:26:14 +01:00
Tobias Hunger
ca4efa4a34 Git: Speed up diff/show output 
* Avoid calling git --version repeatedly
* Use VcsManager to find toplevel directory which does caching.

Task-number: QTCREATORBUG-6906
Change-Id: Ib9ba94751bbecac686a0e116baeded9b2f6f3d90
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 15:23:36 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Tobias Hunger
fab53ac364 Replace Q_ASSERTs with QTC_ASSERTs 
or even with QTC_CHECKs.

Change-Id: I6df67f088bb2f944f0a1abd751fdb192db2be298
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-13 14:34:22 +01:00
hjk
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
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +01:00
hjk
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
Tobias Hunger
363b230abf git: Reuse more code from vcsbase 
Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:03:32 +02:00
Tobias Hunger
35615426d1 Git: Remove debug code 
Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09
Reviewed-on: http://codereview.qt-project.org/6069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:01:47 +02:00
Orgad Shaneh
5396124dd7 Git: Fixed Omit Date 
Issue: QTCREATORBUG-5429
Reviewed-by: pending

Change-Id: Id2bb7fa756b7d5f49e8d7a250431f8042d514fd2
Merge-request: 366
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3151
 2011-08-18 10:58:56 +02:00
Tobias Hunger
3463a813c7 Git: Limit size of git blame output when using omit-date 
* Do not use setPlainTextData on VCSBaseEditor only as that one implements
  the size limits on VCS output.

* Rework removal of date data from lines to limit copying

Change-Id: Ic1f507eb7bdabdb82b4a37a3d3e6f9381775b680
Reviewed-on: http://codereview.qt.nokia.com/780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-27 17:10:12 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
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
Friedemann Kleint
a9a5e3ea17 Exported header cleanup. 2011-01-20 14:03:07 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +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
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
Friedemann Kleint
42b39023db VCS polishing: Change context menu entry for 'Blame parent'. 
... for git, hg as it is not obvious from the SHA1 displayed.
 2010-08-13 09:12:27 +02:00
Friedemann Kleint
bcd020f382 VCS[git]: Introduce optional pull --rebase. 
Do 'git rebase --abort' if something fails.
 2010-03-19 16:07:34 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
b81c30df2b VCS[git]: Add log repository action. 2010-01-08 16:07:05 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Friedemann Kleint
bcba9ea604 VCS [git]: Annotate previous version/single filelog annotation. 
Task-number: QTCREATORBUG-503
 2010-01-07 17:29:14 +01:00
Friedemann Kleint
7ce3683143 CVS: Use new VCSBasePlugin-class. 
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
 2009-12-09 12:41:10 +01:00
Friedemann Kleint
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
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Friedemann Kleint
41a9395d21 Optionally shorten git blame output by removing date+line number. 2009-07-15 15:18:03 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
hjk
df7aacd637 more file cosmetics 2008-12-02 15:08:31 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00