feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,622 Commits 108 Branches 368 Tags
4fa66c8a33320adc30f4491bc28468fad53b6b24
Commit Graph

713 Commits

Author SHA1 Message Date
Oswald Buddenhagen
4fa66c8a33 factor out all plugin dependencies to _dependencies.pri files 
this makes it uniform for all plugins

Change-Id: I46ede2cb576059dfbaa74c2448517a102eb44ddf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-27 16:21:16 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
hjk
2cea4c6f80 Vcs: Construct Core::Id directly for submit editor 
Change-Id: I21ca57fa6b73887dfc88b31240096b0851d53cae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-21 13:13:35 +01:00
Orgad Shaneh
9b22c8ed62 Revert "Git: Undo changes on pull with rebase when user chooses not to stash" 
The dialog text doesn't state that the changes will be
discarded. This is likely to be an unexpected behavior.

Will improve the dialog on master

This reverts commit cf41cd5e2a9b1927fd533789a30cfd80a4e0791e

Task-number: QTCREATORBUG-7031
Change-Id: I52eaf3cdef1b10b261ee9d2e9e14aa98e6e32bdd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-03-20 12:15:40 +01:00
Friedemann Kleint
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
Orgad Shaneh
82679ff61c Git: Support SQUASH_MSG for commit message 
Created for a squashed merge commit

Change-Id: I984a02cb27c678ff96950e788b212d85b8516a5b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-19 15:17:29 +01:00
hjk
543ab54f41 Git: Simplify use of Core::Id 
Change-Id: Ib7d68fa0627eda28865e2fa7baf61e9ed40914c9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-19 13:16:41 +01:00
Orgad Shaneh
56881e3179 Git: Interactive rebase 
Change-Id: I3d106ce5b071df4a7a3d77be43e7c24bd7c91dfa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:39 +01:00
Orgad Shaneh
8705862786 Git: Use Qt Creator as an editor for Git 
Qt Creator runs Git in a "dumb" terminal which does not
allow opening an editor. Use Qt Creator itself as an editor
when needed.

Change-Id: Ide073299964803d02479dade24ddee0283ebd83b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:28 +01:00
Orgad Shaneh
db29090b05 Git: Test if an operation is in progress on commit 
Suggest to continue

Change-Id: I7d8d22d976efe446c2f60e2ba18bf08a123cca36
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-03-15 12:49:19 +01:00
Orgad Shaneh
cc3f1ad07d Git: Run continue command asynchronously 
Git might request an editor on continue

Change-Id: I374e9889e32ea1b1b5ed04f9be9d2a829f3b6440
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-03-15 12:49:11 +01:00
Orgad Shaneh
a195ec5298 Git: Introduce ConflictHandler 
Streamline conflict detection in output

Change-Id: I40c90b1d4fa15a32606ddfbc58e8627bdc8dd444
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:49:04 +01:00
Orgad Shaneh
34191f3cc1 Git: Detect rebase-merge 
Change-Id: I2107a2fad456d52989002e560750af78281bd5db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-15 12:48:52 +01:00
Eike Ziller
8c280440dd Git: Don't use variable manager to get current document path 
There's just no sense in going through the expensive variable manager.

Change-Id: I800766ed3c58f789de85e8ff000a8f702125b9ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-12 14:10:58 +01:00
Friedemann Kleint
281b2332d2 Fix Krazy warnings about includes/header guards in version control. 
Change-Id: I75f2040e9b3dd5d9786faf2e829ec808af7f1304
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-12 13:56:47 +01:00
Knut Petter Svendsen
0d3b54f410 ClearCase: Don't show Hijack button for dynamic view 
The Hijack button (makeWriteableButton) should only
be shown for snapshot views.

Change-Id: I809981885d18b6057d82f73b5104b0f1041cd255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-11 14:18:51 +01:00
Petar Perisin
c4ac55cc72 Git: speed up findRepositoryForDirectory 
Change-Id: I50ccb0f6e0e70f463e45feaea8237c434f5f76c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-03-10 23:00:57 +01:00
Eike Ziller
f60873a24f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
 2013-03-08 11:39:33 +01:00
Orgad Shaneh
132f0e2bf3 Git: Update details when working directory is changed 
Change-Id: I48436f6c5a44a9c41e18b60e2e2c7c4204645528
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-06 12:58:15 +01:00
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
 2013-03-04 15:07:19 +01:00
Orgad Shaneh
17019955cd Git: Move some functions from MergeTool to GitClient 
Needed for interactive rebase

Change-Id: I5ba82735f6521087e7d23d8ee3e1beacd10db30a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:25:35 +01:00
Orgad Shaneh
6275308f63 Git: Externally set dialog title for LogChangeDialog 
Change-Id: I5869e17145f9974eb274d4300bbb23ebdc0990f0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:24:28 +01:00
Orgad Shaneh
15374275a1 Git: Rename ResetDialog -> LogChangeDialog 
Required for interactive rebase

Change-Id: I024505bbde1c58a7ccb4ce931322e0f5b467552b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 15:24:07 +01:00
Orgad Shaneh
2f302d640b Git: Make handleMergeConflicts public 
Change-Id: Id33f3ff4b79242e6e86ff51a1699fe41df022bf9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 13:00:27 +01:00
Orgad Shaneh
e427eab068 Git: Close submit editor if all changes were committed externally 
Change-Id: Iae4e9d52aed333def0e5f0c56bca9c68a38430a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:25:22 +01:00
Peter Kümmel
e4e43352a8 Git's config is UTF-8 encoded on Windows 
'git config' command returns UTF-8 strings if the encoding of the file was not hijacked by the user.

Task-number: QTCREATORBUG-8696

Change-Id: I6181a26e56e2883ad5d46194f974e799bfd2aafb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-01 11:09:43 +01:00
Orgad Shaneh
391094ed2c Git: Do not detect repository inside git dir 
Change-Id: I74f7c7eab6dee584bd4c42499ce8e1613d008043
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:40 +01:00
Orgad Shaneh
0cabae0f77 Git: Remove unneeded class qualification 
Change-Id: I7f604973ba1fdb974d6097abeb7127273786f69c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:25 +01:00
Orgad Shaneh
75c15d1f9d Git: Remove redundant check 
outputWindow() cannot be null.

Change-Id: Ie50bff33a3590a20e9de6b2602dac9cd70eb77bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:52:11 +01:00
Orgad Shaneh
9376c24fd0 Git: Fix regexp for cherry-pick and revert conflict 
Output should contain a \n in the end, so $ is counter-productive

Change-Id: I3a7d1dcbed1aa7c78e9a96cafdb3c0d1e65edc7a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 17:51:58 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
 2013-02-28 12:02:40 +01:00
Orgad Shaneh
eb194a8126 Git: Update TODO file 
Change-Id: I4afd7ba6ccce650711df4239d89d1b7643a2373b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-27 15:27:27 +01:00
Orgad Shaneh
7a7117cd33 Git: Undo changes on pull with rebase when user chooses not to stash 
Task-number: QTCREATORBUG-7031

Change-Id: I10bee004482bf8f066f1ddfcf720797e8005ebec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-27 15:27:10 +01:00
Orgad Shaneh
a547b6af46 Git: Fix unstaging modified files 
Regression introduced in ab85e7342e

Change-Id: I92ec1f9d45b713d426fdae99d16e93ba5eb455cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-26 12:54:48 +01:00
Orgad Shaneh
1193b0f5fb Git: Fix dialog titles 
Add one, remove unused one

Change-Id: I3866525238e11f75ecf002b4c9efc916c40e9abd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-26 12:54:40 +01:00
Orgad Shaneh
44acdb6748 Git: Decorate commits on reset dialog 
Change-Id: I42bf5eb87e8d3038746df033cc759492201dc130
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-21 14:57:15 +01:00
Orgad Shaneh
cdcc8256a0 Git: Require 1.7.2 
Remove legacy code

Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2013-02-20 13:29:11 +01:00
Orgad Shaneh
0c92cb015f Git: Simplify cloning of a specific branch 
Delete master branch option is removed since the master branch
is not created when specifying a branch to clone

Change-Id: Ided5e28a40ad459dcfaa3ef91ffa7c24e585d0ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 20:18:39 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
 2013-02-18 14:16:53 +01:00
Orgad Shaneh
4e3f83e388 Git: Mute status calls 
Called from several places for which popping the pane is strange

Change-Id: Ib83cb51e7926a6b27ff59631f6f4452a41f6a950
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:19:28 +01:00
Orgad Shaneh
95a18afc7d Git: Logically reorder fields in change selection dialog 
Initial focus should be on change, not on the button box

Change-Id: I72cc8f887e3dbaba2db909d207432ab369ec572d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:19:23 +01:00
Orgad Shaneh
7f2191ddb6 Git: Disambiguate file argument on log 
Change-Id: Ie89dc32b59af8900764e2af4b8b93354a6c56a51
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:06:21 +01:00
Orgad Shaneh
610a355eb3 Git: Fix cherry-pick/revert commit resolving on conflict 
Change-Id: I3dee32864f1000afce098c1716307929b4da2462
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:06:12 +01:00
Orgad Shaneh
e5e384a237 Fix popping a saved stash 
stash pop accepts only explicit object (stash@{N})

Change-Id: Ie3d40173ffd94849bde30076235f65d5e4e92cc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-18 10:05:54 +01:00
Tobias Hunger
6f0294b03d Git: pull --rebase when appropriate 
Task-number: QTCREATORBUG-8732

Change-Id: I510ac93b118e93cba591c4717cb6779d64869be1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-14 15:36:30 +01:00
Orgad Shaneh
0e86785019 Git: Preserve multiple branches that link to the same commit 
If remote HEAD commit is referenced by multiple branches, only the last
one is currently listed

Change-Id: Iac689125610aaf49c0bc31285a0d283fd48a271c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-14 15:00:18 +01:00
Orgad Shaneh
976c052c0b Git: Remove debug output 
Change-Id: I5610ce9117c997a82ce8d28ff2440bebd28d9181
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-13 21:12:01 +01:00
Tobias Hunger
83d6e81d94 Vcs: Remove "waiting for data" when process fails 
Task-number: QTCREATORBUG-7946

Change-Id: Ic3c3ceddd3b4bf115a1da78a5b5e5b640dbbd1f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-02-13 12:53:21 +01:00
Orgad Shaneh
34fd5ca532 Git: Handle "no changes" case on conflict resolving 
Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:39 +01:00
Orgad Shaneh
c68adbf9c0 Git: Enable skipping a commit on rebase 
Change-Id: Ib83ca453c86b93cb359a2a0a9774c7d39533be4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-12 18:41:31 +01:00