feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
75,754 Commits 108 Branches 368 Tags
a8397c129fd70a85a80518947e69897f2ec26ca8
Commit Graph

31 Commits

Author SHA1 Message Date
Lucie Gérard
a7956df3ca Use SPDX license identifiers 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2022-08-26 12:27:18 +00:00
hjk
ff57cb548d Vcs: Use more FilePath for file paths 
Change-Id: I855cde65d034a9647972a7fddf1e8266d7ccfa88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2021-08-02 14:40:33 +00:00
Orgad Shaneh
354f628052 Git: Filter out commits according to active remote 
... in the Push to Gerrit dialog.

Fixes: QTCREATORBUG-24436
Change-Id: I2f1ab49d9fbeb09ffb66de23d34a2facd53cb725
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2020-08-10 05:51:33 +00:00
Orgad Shaneh
a48cde86f3 Git: Show full description on tooltip in commit chooser dialogs 
Like Push to Gerrit, Rebase, Reset, Fixup Commit.

Fixes: QTCREATORBUG-24366
Change-Id: I0f596f84661a1a4f37fe971683cc0d985a6c9b1f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2020-08-02 05:00:50 +00:00
Orgad Shaneh
202d40f256 Git: Modernize 
* Use auto
* Use override
* Use some member initializers

Change-Id: I3ca000d1c8e4d02331d58b85e68e4d771c636b29
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2018-09-19 19:47:07 +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
Alessandro Portale
9c830a1619 Git: Use Utils::Icon for IconItemDelegate constructor 
Use our icon abstraction instead of file names, because themed icons are
coming.

Change-Id: I0f4e44caf96aeab0c354d2166b111d59b7b29149
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-10-11 13:29:30 +00:00
Tobias Hunger
b4195d5174 Git: Modernize 
* pragma once
* member initialization
* s/struct/class/
* Introduce a static GitPlugin::client() method and use it

Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-02-10 15:01:57 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Tobias Hunger
7b3aa16dc6 Git: Use Qt5-style connects 
The heavy lifting was done by clazy.

Change-Id: I60dcd378419b92f96dc681921701c9231ef8ee57
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-11-23 14:48:09 +00:00
Orgad Shaneh
4eb2224f47 Git: Add override 
Change-Id: Iae0779c1efa8b3b46cf504f7bda00d614a4a157e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2015-04-12 20:03:04 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Daniel Teske
7e59415fd5 LogChangeWidget: Fix keyboard navigation on all platforms 
Change-Id: I42858fd8aa8b5403e0d2a0639a6fe9fe5817f4a6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-04-16 14:57:05 +02:00
Orgad Shaneh
635a355f97 Git: Suppress "No local commits" error message in Push to Gerrit 
Change-Id: Ib0cf79acf48d24848fda92a8b7b06efe62b46dbc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-12 12:42:45 +01:00
Orgad Shaneh
aa6dd83e08 Git: Replace bool argument with flags 
For a start, it's a single flag. Will be extended.

Also change the default for includeRemotes to false (most callers pass false)

Change-Id: I969f89a06b85a42c134c0232d2947d58fe19ea0d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-01-29 11:05:13 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Orgad Shaneh
2d415c8228 Git: Use initStyleOption instead of setting options in paint 
Change-Id: Idc14c157478c7092fce7d688044cb0a99e47bebe
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2013-12-03 09:12:46 +01:00
Eike Ziller
4eabcdc8fd Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
 2013-10-22 08:40:59 +02:00
Orgad Shaneh
9ef8d71e2c Git: Indicate affected commits for range operations 
* Reset: Strikethrough discarded commits
* Interactive Rebase: Mark included commits
* Push to Gerrit: Mark pushed commits

Change-Id: I5599a72055fd94b88c55b74b3a1116c07e35c113
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-17 16:39:08 +02:00
Orgad Shaneh
089c5dd927 Git: Open LogChangeDialog on top of the main window 
Change-Id: I9fe92f4e1e91e7a4a80a34e802d0d6b8d92b77e4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-17 16:38:07 +02:00
Orgad Shaneh
a5c970bea2 Git: Rename widget member to m_widget 
Follow coding style

Change-Id: I9583cdfc7ec32140614beb8684d3f15344fa7135
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-10-16 09:01:08 +02:00
Orgad Shaneh
1f447715b0 Git: Remove double warning for gerrit push 
Change-Id: I5581521753fa525c6bb9f53725c28f947c8bbd44
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-06-04 10:43:54 +02:00
Orgad Shaneh
325c0beda5 Git: Show commit on double-click in fixup editor 
Change-Id: I8cb08b0fcba3ddac7223b39b3762ff71e8d61f8c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-06 10:25:10 +02:00
Orgad Shaneh
aa5b049561 Git: Improve LogChangeWidget 
* Enable display of local-only commits
* Enable specifying a top commit

Change-Id: I0688ba9ac670f709d2044ae2b7bff081fd86c860
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-05-04 20:01:23 +02:00
Orgad Shaneh
c702639a8e Git: Factor out the central widget from LogChangeDialog 
To be used for "amend previous commit" feature

Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 14:38:05 +02:00
Petar Perisin
f4eabcfa0e Git - ChangeSelectionDialog select from recent history 
Change-Id: Ib87f9bd997a5c7c07abfd56a05d9e454c1a9ea93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-30 13:37:05 +02:00
Orgad Shaneh
e6da908321 Git: Refactor reset 
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-19 14:12:25 +02: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
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