feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
57,255 Commits 108 Branches 368 Tags
f5203796e42d25bca7569df1cc746bbe995ee548
Commit Graph

1839 Commits

Author SHA1 Message Date
Orgad Shaneh
aae153db1b Git: Abort mergetool if not configured 
When merge.tool is not configured, mergetool is not started, and the
following message is displayed:

This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge
ecmerge p4merge araxis bc codecompare emerge vimdiff
Merging:
test.cpp

Normal merge conflict for 'test.cpp':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (vimdiff):

On Windows, vimdiff is the default, and since it is textual, if we use it,
we have no way to pass any input for it, then we reach a dead-end.

On Linux/KDE (if DISPLAY is set), Git defaults to kdiff3. This is better,
but we cannot count on it even being installed.

Just abort with a warning on this case, and let the user [install and]
configure the preferred (graphical) mergetool.

Change-Id: I7144d9348a4d1ee03176b71b4ac2242b16795403
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-06-19 11:51:29 +00:00
Orgad Shaneh
909f30f006 Gerrit: Update remotes on settings change 
If the user is changed, we need to refresh at least the fallback server.

Task-number: QTCREATORBUG-20536
Change-Id: If21830ae5607907db9aaee164bc85b971ff93010
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-06-19 09:38:16 +00:00
Orgad Shaneh
4a868d6a18 Gerrit: Fix modality of warning message for invalid configuration 
Task-number: QTCREATORBUG-20535
Change-Id: I4963e3856da12b40a323fbcdab6f0a12a9e15293
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-06-19 09:37:35 +00:00
Orgad Shaneh
a39516aef1 Git: Update file model after unsuccessful commit 
The commit operation itself [un]stages files before actually committing.
The model has to be refreshed after that.

Change-Id: I4b765005640b62812687d4f003d94af3717c379e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-06-19 09:37:14 +00:00
Orgad Shaneh
23b8e6d531 Git: Minor cleanup in commit processing 
Change-Id: I99214441059a097b8aeb197638fc58e407a7d27b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-06-19 09:37:06 +00:00
Orgad Shaneh
14fb71ecec Gerrit: Unset authenticated on unknown error 
Let the server retry authentication on next update.

Change-Id: I22d9fcde2b501fc7c9b9d86bb9b656c73d3ee840
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-06-19 09:36:40 +00:00
Orgad Shaneh
5905a30dff VCS: Unify default and maximum timeout in all setting pages 
Task-number: QTCREATORBUG-16009
Change-Id: Ibbaaef441ac2dc0147af2bc0631e0b0d98b4f57d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-06-19 07:34:34 +00:00
Orgad Shaneh
acb611c8cf Git: Show also stderr on Mergetool 
Change-Id: I06507b1bb8d3d83a09a746a6b5ba75def859dc6c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-06-17 13:03:19 +00:00
Orgad Shaneh
b63ae202e7 Git: Use nullptr in Mergetool 
Change-Id: I93206f5d735f3b8b291d752faf6b7da77e98342e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-06-17 13:03:05 +00:00
Orgad Shaneh
d7b8dcc684 Gerrit: Do not refresh dialog on update remotes when hidden 
Change-Id: Ie9b00c1a117b1b2a3823dcb9249ed563b3dbd4a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-06-01 09:28:41 +00:00
Orgad Shaneh
cf960e4788 Gerrit: Fix some clang-tidy warnings 
Change-Id: Idaccca0bd6d7682feeac8a0964ce2abb788f3e99
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-06-01 05:59:04 +00:00
Nikolai Kosjar
b2f8ffdb20 Git: Fix handling Esc in "Create Local Branch" dialog 
Change-Id: I8415e7ffcdbeb648b28273aa5791144e95f63de9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-05-31 12:14:01 +00:00
Eike Ziller
6e66b2a078 Remove some lambdas from Utils::transform calls 
It is often possible to user (member) functions or members directly.
That improves readablility and potentially reduces the total number of
symbols.
Also use qobject_container_cast at places where it is appropriate.

Change-Id: Ia2591bca356591e001e2c53eeebcf753e5bc3c37
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2018-05-28 13:45:20 +00:00
Tobias Hunger
c4530d64b8 Git: Consistently use nullptr 
Fixed by clang-tidy modernize-use-nullptr.

Change-Id: I15944fd368fc9ee748545a295632fd1059048c46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-05-07 16:47:16 +00:00
Orgad Shaneh
366b813c5c Gerrit: Warn when probably pushing to wrong branch 
For rebase/merge strategies, this can cause real problems (when the target
branch is forwarded to a more recent branch...)

Task-number: QTCREATORBUG-20062
Change-Id: Ic7c282a1e0571b31d9333290141817c59daa0e7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-05-02 15:45:53 +00:00
Eike Ziller
428fcb476b Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
 2018-04-13 10:54:42 +02:00
Jarek Kobus
e806ea40cc Pass this context object to the connect() 
Otherwise when "this" instance
gets deleted and the sender still exists, the lambda
expression is still invoked for the deleted object.

Task-number: QTCREATORBUG-20223
Change-Id: Ifd5c9e6ce1fe7fde71698c6683cdfcd7566e8d35
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-04-09 09:31:40 +00:00
Orgad Shaneh
7d3a79c696 Utils: Purge asConst 
Replace by qAsConst.

Change-Id: I3301366f73c066c86f08df7188d70dc3b613c55c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2018-04-09 09:04:00 +00:00
Eike Ziller
f1e02c0826 Fix that menus didn't show ampersands in files names 
And instead interpreted the ampersand + following character as an
accelerator key.

Task-number: QTCREATORBUG-17817
Change-Id: I327239499ce56e75fd12f2df5be60d4b04913acd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-03-26 12:02:15 +00:00
Eike Ziller
278a5f1e33 Merge "Merge remote-tracking branch 'origin/4.6'" 2018-03-16 10:29:37 +00:00
Nikita Baryshnikov
e3918b563f Git: show commit given as command line parameter in diff editor 
ex: qtcreator -client -git-show d3eb585db9 from qt-creator source dir.

Change-Id: Ice62f062d431d2ab74e3d6832dfc8b0b555dfa19
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-03-16 09:45:45 +00:00
Eike Ziller
cb84ae1a21 Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
	src/plugins/qmakeprojectmanager/wizards/testwizard.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I126823f5f60613509520c07f52be7bc9d4f4367c
 2018-03-16 09:28:08 +01:00
Jarek Kobus
da2c66b1d0 Move git specific stuff out of diff editor plugin 
Move it to the git plugin.

Change-Id: I8151573ed50df70776f7ebf0475dd41fb84fae83
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-03-15 11:21:01 +00:00
Eike Ziller
0b10ecc718 Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/ios/iosrunfactories.cpp
	src/plugins/nim/project/nimproject.h
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
	src/plugins/qnx/qnxrunconfigurationfactory.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/winrt/winrtrunfactories.cpp

Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
 2018-03-13 11:25:38 +01:00
Orgad Shaneh
a776157cab Git: Show decorations in commit details 
Change-Id: Ifbf4737b0d374006a69b7005e4c6a032d5bf43e3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-03-07 13:42:20 +00:00
Tobias Hunger
0f53b35757 Git: Fix warning about unused lambda captures 
Change-Id: I9535dccfe0af169efaa6dc09898d34c4c9e17efd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-03-06 14:18:44 +00:00
Andre Hartmann
a2edfda1ca Git: Extract BranchUtils for re-use in Branches Side Panel 
Done-with: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Change-Id: I1f48ffb3d9bb9b8d743ab6891c472fcfab778cf6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-03-01 21:20:42 +00:00
Eike Ziller
7c3cfa166d Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	src/plugins/coreplugin/helpmanager.cpp

Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
 2018-02-23 10:56:52 +01:00
Jarek Kobus
64233a4fae Fix repeting Stage/Unstage actions in unified diff editor 
Don't store diff file index, chunk index and diff editor
controller anymore. Pass needed indices by value,
retrieve them when needed as lambda copy.

Change-Id: I3a81f1ab6d131c0b1d9899ac4b061b6e25582f51
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-02-16 06:48:27 +00:00
Eike Ziller
c7fdb93865 Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I2445882a270731b866b04f28ff87d161224c539a
 2018-02-13 13:37:37 +01:00
Robert Loehning
7282e05554 Improve translated strings 
Change-Id: I7a45c6f8dcbb0e1b3c17a60823664fe1943c5654
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2018-02-09 16:36:54 +00:00
Eike Ziller
5432dd1f5c Merge remote-tracking branch 'origin/4.6' 
Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
 2018-02-07 11:58:23 +01:00
hjk
713b8636ea Vcs/Text search: Remove a few addAutoReleaseObject uses 
Using a QObject parent suffices here.

Change-Id: I4dc5448511d55bf14fbd8f810e91336a49e94094
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-02-06 11:58:15 +00:00
Leena Miettinen
88a889d45a Gerrit: Fix UI text 
Change-Id: I5be1fc3629961dbc224d65d1bc52efc9a4613d2a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-02-05 16:14:01 +00:00
David Schulz
0eb7bab20c Core: make useMacShortcut constexpr 
Change-Id: I293b96428784b6efecac6dae4f2f9690af0027da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-02-02 13:15:55 +00:00
Andre Hartmann
6bc12ff446 DiffEditor: Replace bool arguments with flags enum 
Change-Id: I70262476d015ba5b73069b149093dac66f7c6008
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-01-17 09:13:40 +00:00
Orgad Shaneh
d1baa80a98 Git: Do not pop the VCS pane on every [Un]Stage 
Task-number: QTCREATORBUG-19051
Change-Id: I8dcf95238dcbc396b2dfe6a7d6048bbbb8551921
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-01-13 17:05:02 +00:00
Eike Ziller
c44c4392ae Merge "Merge remote-tracking branch 'origin/4.5'" 2018-01-09 12:44:32 +00:00
Przemyslaw Gorszkowski
e25edc5020 Git: add reload button for 'git blame' and 'git log' windows 
Change-Id: I64685e779bed91d41e38bdc1454571dbbcd7f177
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-01-09 12:28:26 +00:00
Eike Ziller
cff2cc90e2 Merge remote-tracking branch 'origin/4.5' 
Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
 2018-01-09 13:13:00 +01:00
Orgad Shaneh
a8ddaafca4 Git: Introduce Recover Deleted Files action 
Change-Id: I913c07522a8ca82366fd142597430c02e53faa27
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-01-09 11:33:21 +00:00
Orgad Shaneh
53b2df46e0 Gerrit: Set current repository every time the dialog is shown 
Task-number: QTCREATORBUG-19562
Change-Id: I17918e08f7d3092ffe54ab359bf2b41c51813367
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-01-08 08:13:53 +00:00
Orgad Shaneh
1decef8fc9 Gerrit: Deduplicate detection of current repository 
Change-Id: Ib3a63f71dd45c45b20eab51a2a0bf9c21ba8754a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-01-08 08:13:48 +00:00
Eike Ziller
a2739f55ed Merge remote-tracking branch 'origin/4.5' 
Change-Id: Ic7c16091268083c0426cf29f0691a7ee458f2bd9
 2017-12-07 09:16:01 +01:00
Orgad Shaneh
2559ad48a8 Git: Show success message on push 
Change-Id: I78433d7c7aec65fbafcba49fabf0562571dfbeff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-12-05 10:12:09 +00:00
Alessandro Portale
2349a0a5c4 Git: Gerritpushdialog: Fix draft push for older Gerrits 
Logic for "Non-Draft" and "Draft" was swapped.

Change-Id: I14640e1a6321332c6f0cc0b3e8364194f52bcbaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-12-03 18:37:41 +00:00
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5' 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
 2017-10-25 16:07:21 +02:00
Eike Ziller
cd93f624da VCS: Fix translation issues 
Change-Id: I3d85a3fc9d34144ca30ef1e37b22bfe7874b8e64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-10-24 08:12:11 +00:00
Robert Loehning
93c616b23f Git: Remove unused variable 
Change-Id: If7656e0938380714bff655c80e6d0082a427ef71
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-10-23 09:08:24 +00:00
Alessandro Portale
1c0dc848e0 Git: Reduce the minimal height of the Gerrit dialog a bit 
The current Gerrit dialog is too high for my 1366x768 screen, and
therefore it either misses the title bar or the confirmation buttons.

This change reduces the minimal height of the "changes" and "details"
sub-widgets proportionally.

Change-Id: I548e1e04bb47b881bee55e28bf362a84ae11a87c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-10-19 23:00:30 +00:00