feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
29,497 Commits 108 Branches 368 Tags
bc9bb4b93cafcfb379309a1e706a853bae182bb8
Commit Graph

334 Commits

Author SHA1 Message Date
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
Yuchen Deng
c7d712e8d3 Git: Add support for the i18n.logoutputencoding setting 
Change-Id: I99df9765da1ba68c449f8879c8262c3ca3fbc28c
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-21 11:42:49 +02:00
Yuchen Deng
08f97b50d7 Git: Support encoding convert of commit messages 
We need read i18n.commitEncoding value, to write correct encoding of the commit file.
In Windows OS, the default encoding is GBK, So we need convert to correct encoding of the commit messages.

Change-Id: Id5f35745dba15da2c9ceb1266e0ea537cba7da73
Merge-request: 382
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-21 11:42:28 +02:00
Yuchen Deng
854c0f2ed8 Git: Fixed launch gitk failed 
Task-number: QTCREATORBUG-6262
Change-Id: I2095e4244b145e57e901fa9d6ca6adbcb10aa0c0
Merge-request: 402
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6510
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-12 11:50:37 +02:00
Tobias Hunger
f654d664ef Git: Use indexes to address pretty printing combobox 
This fixes a incompatibility with the config settings.

Change-Id: I518291af2309acfaba7eea78b22519c283114009
Reviewed-on: http://codereview.qt-project.org/6161
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-06 15:48:04 +02:00
Tobias Hunger
c6a9de7252 Git: Save settings 
VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(

Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:46 +02:00
Tobias Hunger
ddf01f357b Git: Remove GitCommand 
Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 17:34:30 +02:00
Tobias Hunger
541e61612a Fix rebase issue and warning 
Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:20:54 +02: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
f6068c1ff9 git: coding style fixes 
Change-Id: I554e46cc5e3c1b55bc245f20f7f9541103afb8c5
Reviewed-on: http://codereview.qt-project.org/6070
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-10-05 16:02:18 +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
c20bc6abd1 Git: Added decoration to log and show 
Merge-request: 385
Reviewed-by: Tobias Hunger <tobias.hunger@gmx.de>
Change-Id: Id3ad9b6153ca9ca1133f0f3a90fe63ecf6525caa
Task-number: QTCREATORBUG-5749
Reviewed-on: http://codereview.qt-project.org/5158
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-19 16:16:33 +02:00
Tobias Hunger
a323c0d9fb Git: Fix diff/show/blame editors coming to the foreground 
Make sure all the proper arguments are applied when bringing a git
diff/show/blame editor to the foreground.

Task-number: QTCREATORBUG-5176
Change-Id: I4ca603311335ac4e591ba38a690f1f3a27725e8f
Reviewed-on: http://codereview.qt-project.org/5157
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-19 16:09:04 +02:00
Tobias Hunger
c5c94206ba VCS: Make initialization of a repo trigger updateActions 
Make initialization/cloning of a repo trigger an updateActions.

This is needed to e.g. enable git actions after a git repo is created.

Reviewed-by: Hugues Delorme
Change-Id: Ia8513a216e584fe8e512fdd5d6215aa96c075f3f
Reviewed-on: http://codereview.qt-project.org/4878
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-14 10:53:20 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Tobias Hunger
ebb238c885 Git: Fix ignore whitespaces/patience 
Fix initital evaluation of ignore-whitespace and patience flags in
git diff.

Task-number: QTCREATORBUG-5176
Change-Id: Ibe3652ca6426fbc6e7187140b1d101afbec6c5ae
Reviewed-on: http://codereview.qt.nokia.com/2509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 13:03:12 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/) 
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-29 12:19:11 +02:00
Tobias Hunger
7d573006a9 Git: fetch from remote 
Task-number: QTCREATORBUG-4942
Change-Id: Ifd8586e110379a621c43233fe9b912bd82f7f28a
Reviewed-on: http://codereview.qt.nokia.com/218
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-07 11:32:44 +02:00
Fawzi Mohamed
e54a959ef1 Editor: fix to always call forceReadOnly before activation 
Move the call to force readOnly to before the activation for the editors
that had it after their activation call.
Not having signals, currently dynamic changes of the editor read only
state are not really supported, and on windows some actions remained
activated.

Task-number: QTCREATORBUG-4774
Change-Id: I09a84c6e558ddf61aeedb928f8688f6ed65e89c0
Reviewed-on: http://codereview.qt.nokia.com/20
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-05-19 15:53:16 +02:00
Tobias Hunger
3cf07cba38 Git: String updates 
Reviewed-by: Leena Miettinen
 2011-05-13 14:56:31 +02:00
Tobias Hunger
8966c27207 Git: Add dialog to configure branches 2011-05-12 17:32:56 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +02:00
Tobias Hunger
bcd8740a6e VCS: Notify project wizard about config changes 
... and have the project wizard update the available VCS.

Task-number: QTCREATORBUG-4423
 2011-04-15 17:45:34 +02:00
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
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
Jarek Kobus
148e389587 Fix typos in source strings 
Reviewed-by: Pawel Polanski
 2011-03-31 16:31:25 +02:00
Friedemann Kleint
491a27163a VCS[git]: Add 'Revert this chunk' context menu option to diff view. 
Implement in git. Add infrastructure to revert single chhunks
by using patch -R. Currently only implemented in git since
only that has functionality to re-run diff.

Rubber-stamped-by: hunger <tobias.hunger@nokia.com>
 2011-03-24 15:46:09 +01:00
Thorbjørn Lindeijer
70b70770a4 Fixed layout issues in some editor toolbars 
Cleaned up some hacky code in the process.

Done-with: Tobias Hunger
 2011-02-25 16:11:20 +01: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
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