feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
44,658 Commits 108 Branches 368 Tags
b4195d51746d86f4aa459d07d14a328c7945981a
Commit Graph

296 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
29cdaccd13 Use classes in favor of structs 
Change-Id: I6ad2df70b7ad9b5fdc5baddc3ef85d0fed0c139c
Reviewed-on: http://codereview.qt.nokia.com/2518
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-02 15:56:55 +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
Tobias Hunger
8966c27207 Git: Add dialog to configure branches 2011-05-12 17:32:56 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +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
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
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
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
827800c2c4 Git: Allow for pretty format selection in git show 
Allow for pretty format selection in git show.

Save selected value and default to "email".

Task-number: QTCREATORBUG-3341
 2010-12-09 16:41:32 +01:00
Tobias Hunger
a13014eb4e Fix whitespace issue 2010-11-22 15:16:49 +01:00
Tobias Hunger
f84c228568 Git: Add options to diff editor 2010-11-22 12:03:07 +01:00
Tobias Hunger
9dd9475e84 Git: Use class instead of struct 2010-10-29 14:19:18 +02:00
Tobias Hunger
2cf9910070 Fixup formating of mr2178 
Merge-request: 2178
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2010-09-29 12:29:13 +02:00
Tuomas Puranen
65e95c3aba Added few new functions to IVersionControl, VCSManager and GeneratedFile to support the funcationality needed by the trac plugin. 
All the version control plugins updated to have implementations according to the interface changes.

Merge-request: 2178
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Merge-request: 2178
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2010-09-29 12:29:12 +02:00
Tobias Hunger
1613208c00 Git: Fix commiting with Author and Email set 
Fix commiting with Author and Email set on Windows.

Task-number: QTCREATOR-2397
 2010-09-24 17:31:44 +02:00
Robert Loehning
96e06a9fbb git: Fixed launching of gitk 
In cases where binary 'wish' is not in PATH variable this could not be
started.
 2010-09-17 13:38:01 +02:00
Robert Loehning
b719bbda42 VCS[git]: Added git fetch 2010-09-01 13:09:20 +02:00
Robert Loehning
e02e0f8c4a VCS[git]: Added showing logs of all branches 2010-08-27 15:52:18 +02:00
Friedemann Kleint
56e800927e VCS[git]: Environment settings. 
Make GitClient::synchronousGit use the process environment.

Windows: Add a setting to fake a 'HOME' environment variable
(%HOMEDRIVE%%HOMEPATH%) to make msysgit look for its SSH-keys
there not only when run from git bash, but also from Qt Creator.
Useful in MinGw-setups, where git must not be in the path.
 2010-08-26 13:45:01 +02:00
Friedemann Kleint
0f0c17111d VCS[git]: Add menu option for git amend. 
Task-number: QTCREATORBUG-1642
 2010-08-23 12:18:01 +02:00
Friedemann Kleint
cb33332311 VCS[git]: Add branch combo to the checkout wizard. 
Provide UI with manual refresh button in BaseCheckoutWizardPage.
Change ProcessCheckoutJob to be able to execute several steps.
Implement in git.
 2010-08-12 14:44:57 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
 2010-08-06 10:46:50 +02:00
Robert Loehning
e2347b3d92 git: Added an option to undo unstaged changes only 2010-07-30 19:39:55 +02:00
Friedemann Kleint
7dc2760f0e VCS[git]: Add menu option to launch gitk. 
Task-number: QTCREATORBUG-1577
 2010-06-08 15:55:12 +02:00
Friedemann Kleint
7b60fd1b89 VCS[Mercurial]: Make push/pull synchronous commands. 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
 2010-05-25 12:24:18 +02:00
Friedemann Kleint
1c69b97ca6 VCS[git]: Make push/pull synchronous commands. 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
 2010-05-25 11:48:53 +02:00
Friedemann Kleint
5364f5c152 VCS: Show message box on timeouts/Add SSH prompt. 
- Use message boxes on timeouts.
- Add a configuration for a graphical SSH password prompt binary with
defaults
- Launch commands that require authentification with no terminal on UNIX
and environment variable SSH_ASKPASS set accordingly.
- First attempt at introduce a common function to synchronously run VCS
commands in base plugin with flags.
- Use standard execution log entries in all VCS plugins (outputwindow).
 2010-05-21 17:46:00 +02:00
Friedemann Kleint
20f26c987f VCS[git/hg]: Prevent search for repository from creating folders 
... when autofs is involved. Check for files instead of folders
and stop checking/recursing up at '/' or $HOME. Further fixup
will follow.

Task-number: QTCREATORBUG-1361
Task-number: QTBUG-10495
 2010-05-20 08:48:17 +02:00
Friedemann Kleint
b4b177fa27 VCS[git/hg]: Prevent search for repository from creating folders 
... when autofs is involved. Check for files instead of folders
and stop checking/recursing up at '/' or $HOME. Further fixup
will follow.

Task-number: QTCREATORBUG-1361
Task-number: QTBUG-10495
 2010-05-19 17:41:14 +02:00
dt
9bc9fe73e1 File renaming 
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
 2010-05-12 14:14:44 +02:00