feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,691 Commits 108 Branches 368 Tags
d301fb42e91765ae829f7021c3b26ef159cadc9a
Commit Graph

568 Commits

Author SHA1 Message Date
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
Orgad Shaneh
bd7499b896 Git: Do not append formatting when log failed 
Happens for 00000000 for example

Change-Id: I1ab3157dd87744a4b16284d91dd26f42898965e9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 22:24:57 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget* 
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-07-19 15:15:53 +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
960bfeb46d Git: Limit length for revisions displayed in context menu 
Change-Id: I335b49ed9af9c3f2ae083a03e4109173b3783f76
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 00:42:54 +02:00
Orgad Shaneh
0fb6aafdc3 Git: Use HEAD as parent revision for 00000000 
Change-Id: I4f583bb184fff00ea49a27de9df96aa348b81004
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-19 00:40:57 +02:00
Orgad Shaneh
202ce8ad70 Git: Improve Clean dialog 
Check file iff it is not ignored

Change-Id: I16a489bdd772ea9b4df462b449a23324b5ef3b77
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:13:33 +02:00
Orgad Shaneh
3b5c40ba47 Git: Cleanup 
* Remove unused 'silent' argument
* Do not output 'git --version' command

Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-07-02 11:10:34 +02:00
Orgad Shaneh
59417df92a Git: Keep author information on amend 
Change-Id: I15982b746656536ae79a612ee563f69b58a4baa7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-28 22:22:08 +02:00
Orgad Shaneh
616cb86ea7 Git: Better status resolving 
Do not consider new files as Changed

Change-Id: Id1ddb870e51a974a2d20fc2ecc9fb499d1db6f8c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-26 10:29:20 +02:00
Orgad Shaneh
a452db5055 VCS: Fallback to raw revision if decorate fails 
Change-Id: I64537306723dc1bd3c979f22af2213f0f5cd8f84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-05 10:43:47 +02:00
Orgad Shaneh
671bfb9250 VCS: Always allow "Revert Chunk" 
Remove revertDiffChunkEnabled property

Any diff view might relate to previous changes, so it makes sense
to always allow reverting them

Change-Id: I8da0fb2d8625ac98140d1bde0296a4478bc6a0b7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-06-04 11:35:07 +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
hjk
21bf0046c3 editormanager: simplify use of interface 
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-11 13:51:14 +02:00
Friedemann Kleint
043c179376 Git: Fix warning about invalid connection. 
Change-Id: Iabf33b764dc451d51bfc523d6b3c9b247adab383
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-05-03 20:32:09 +02:00
Friedemann Kleint
9a5fa0dd48 Git: Offer recent list of changes for reset --hard. 
This makes it easier to remove changed applied for review
by Gerrit.

Change-Id: I2e3407ae4e74b650d08d53fed37e9aeb11071a4e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-05-02 11:12:49 +02:00
Bradley T. Hughes
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
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-04-17 09:53:44 +02:00
Orgad Shaneh
d207165f6a Git: Allow commit (or amend) when not on a branch 
Git allows that so why can't we?
Useful when in the middle of merge/rebase.

Change-Id: Id09da3417904ff29e6dd1b4ef383157e9c4920d3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-14 11:18:41 +01:00
Orgad Shaneh
6a3f9460d7 Git: Enable --no-verify for commit 
Change-Id: I88cfb7839b41467e3f6b25bea329eb15765e440e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-14 11:18:18 +01:00
Francois Ferrand
4d1bbebf2a Git: Add customizable repository browser command. 
Change-Id: Iac297e3665b18d97ca80097c4dd33dd70e64b9a1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-12 15:49:17 +01:00
Orgad Shaneh
8b6a2b0a85 Git: Do not fail on amend if no files were modified 
Task-number: QTCREATORBUG-6916
Change-Id: I44d69bdd11487388163723dffa56a6690ac14239
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 11:28:04 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager 
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-20 13:32:49 +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
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
Tobias Hunger
a309c26f1b VCS: Never try to run empty binaries 
Never try to run empty binaries.

Task-number: QTCREATORBUG-6849
Change-Id: I591fdb9d39394fc8097908f5934a1a96518859cb
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2012-02-03 09:11:24 +01:00
Orgad Shaneh
d3f889df7d Git: Prepend to PATH instead of replacing it 
Change-Id: Ia6d783e97d7f4c80a3838b0167dcdcfce5fe4a6e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-31 11:43:38 +01:00
Friedemann Kleint
e2ace515e2 Version control: Compile with QT_NO_CAST_FROM_ASCII. 
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-31 11:26:52 +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
hjk
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +01:00
Tobias Hunger
4894c559ac VCS: Fix warning about hiding a virtual method 
Change-Id: I8f314486a50f9b7015572615d2306d5c7e2f1670
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2012-01-20 11:59:43 +01:00
Tobias Hunger
82709dc766 Git: Fix finding of top-level directory 
Fix finding of top-level directory for git when
  * Git version >= 1.7.0 and
  * the directory queried does not exist

Task-number: QTCREATORBUG-6821
Change-Id: I54a6050b71fe924f421921b8e5b468578db1210d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-01-17 14:59:11 +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
Yuchen Deng
8e1f24a638 Git: Fix error encoding of output text in some case 
Change-Id: I0bf4269266e725d567b3ff69e4a3ea202911b3ab
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-13 11:28:48 +01:00
Orgad Shaneh
6a17d889d4 Git: Find correct topLevel 
Task-number: QTCREATORBUG-6756

Change-Id: Iefaa8cb112f7da6e6eb76ec852f8f61abcd626ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:43:58 +01:00
Yuchen Deng
58f8d43fff Git: Fix error encoding if the source file not exist 
Change-Id: Ia98195f966e79d65f1947c638cb9aacfb9b2f309
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-01-11 15:36:16 +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
Tobias Hunger
a2d4538cfc Git: Fix editor parameter widgets 
Change-Id: Idaf0c69fc05258678eb8853d6c5661e2901cc522
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2011-12-12 17:27:33 +01:00
Orgad Shaneh
7019a51f8f Git: Enable difference display in Log 
Task-number: QTCREATORBUG-5726

Change-Id: Ide3f66de3bbccf86f4a044f8aa3f2fa0fe3d7c36
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-12 12:24:56 +01:00
Orgad Shaneh
e7a2327206 Git: Use MERGE_MSG as commit template when exists 
Change-Id: I6aedc91309f8599004e467f9e733d7935fc9c266
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-12 11:55:36 +01:00
Robert Loehning
0470f30b91 Fixed possibly unused variable in GitClient 
Change-Id: I6faa1ff63da8df322e2c8f98d2efd8670c341cc4
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-08 14:11:09 +01:00
Tobias Hunger
02d74bd3e7 Git: Push to non-default remotes 
Allow pushing into any of the defined remotes via Tools->Git->Remotes...

Task-number: QTCREATORBUG-6382
Change-Id: I0bab34da4ec27c377993782b905b1d6c4f5a14b9
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2011-12-08 11:18:10 +01:00
Tobias Hunger
854a37cb1e Git: Fix branch list when checking out from git 
Task-number: QTCREATORBUG-6563

Change-Id: I18f20c477a5c3ac3921110c1f76f15fedeaab99b
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2011-12-08 11:02:11 +01:00
Orgad Shaneh
d3876c5461 Git: Add diff options for show 
Task-number: QTCREATORBUG-5262

Change-Id: I3e911fbb32c5d11cd46747b459c5b1a73c0a99b9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-12-05 12:37:38 +01:00
Yuchen Deng
73138f633f Git: Figure out codec for amend commit 
Change-Id: Ib8fddbb8343f92cf74b99117999ec033b1785404
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:25:43 +01:00
Yuchen Deng
8382dd7a03 Git: Fix error text codec of 'Show Commit...' 
Change-Id: I4c7e2b2aad44b4f4b53fa936e80ab0d70c75c3c5
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:24:43 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +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
494fbdb0d2 Git: Do the right thing when commiting 
Do the right thing when commiting in git. This allows
staged files to be commited without additional changes, etc.

Change-Id: Ib04c91cf9c105c4a2bbe013926112d6d5d3bade6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-31 11:49:39 +01:00