aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce
Commit message (Collapse)AuthorAgeFilesLines
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-2/+1
| | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Perforce: Remove QRegExp usehjk2020-06-242-15/+17
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: Id234cc2206afd3e1372c25749e73d7c31c7ebd7f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Add vcsDescribeOrgad Shaneh2020-06-181-6/+6
| | | | | | | Already exists in all implementations, but there was no common declaration. Change-Id: Ieb3d10d1936c207722b5001712bce41e8114dcdc Reviewed-by: André Hartmann <aha_1980@gmx.de>
* IVersionControl: Change vcsAnnotate return type to voidOrgad Shaneh2020-06-181-13/+3
| | | | | | | | | | | All implementations return true unconditionally, and the return value is never read anyway. + Remove superfluous function with the same name in Perforce. Change-Id: I83f361ec7fd8be3177cb4be52e6276e295cd4279 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: hjk <hjk@qt.io>
* Use dialogParent() instead of mainWindow()Eike Ziller2020-06-021-1/+1
| | | | | | | | | | There are very few reasons to use mainWindow() directly. Especially for modal dialogs, using dialogParent() is important, since that guarantees the stacking order in case of other dialogs currently being open. Change-Id: I7ad2c23c5034b43195eb35cfe405932a7ea003e6 Reviewed-by: hjk <hjk@qt.io>
* VCS: Replace QRegExp with QRegularExpression in VcsBaseEditorOrgad Shaneh2020-02-212-7/+6
| | | | | | Change-Id: I8e8a6649e441597e29e88506d494ec69260bebd1 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* VCS: Refactor annotationChanges() in VcsBaseEditorOrgad Shaneh2020-02-202-23/+1
| | | | | | | Devirtualize the function, and use QRegularExpression with globalMatch. Change-Id: I18c92cb37b535c616f03f45dff8b18249c961d5d Reviewed-by: hjk <hjk@qt.io>
* Vcs: Make VcsBaseEditorWidget::test* operate on factories directlyhjk2020-02-131-1/+1
| | | | | | | Saves re-discovery by id. Change-Id: I026c1388d02f125147a9b4f5367d7a1a266bff3c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove apparently unneeded QtPlugin includeshjk2020-02-121-1/+0
| | | | | | Change-Id: I511c0318a72dbf2a92e4749dee02eabfc9826139 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Vcs: Make some editor factories proper plugin pimpl membershjk2020-02-071-52/+61
| | | | | Change-Id: I7f815c53bac8621b2198c57d7f1d7d4bd43eb282 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Separate plugin and QObject parent roles for VcsSubmitEditorFactoryhjk2020-02-061-1/+1
| | | | | | | | These are different when the factories are used as real members, as already done in Bazaar. Change-Id: I3c187896dcbacb5156be1543424ccacb9140a493 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Move responsibility to set editor parameters to editor factoryhjk2020-02-063-5/+4
| | | | | | | | | | | | So it doesn't need to be named twice in the editor factory setup. This intentially includes a de-optimiztion: storing the parameters by value, not by pointer. That's more natural, does not need to keep the parameters alive on the caller side, and it's uncritical in this context. Change-Id: I92867d3f2f75c38911ae82d3eeb4759cba71b723 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Perforce: Move PluginPimpl definition to .cpp filehjk2020-02-055-327/+287
| | | | | | | | Helps to get rid of on option page parent, and a couple of accesses to singletons. Change-Id: Ifff2fb4aa56216f78acd5eb2a67c4b0f64a45c0e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Perforce: Move settingspage closer to new standardhjk2020-01-312-70/+42
| | | | | Change-Id: Ia69b9f1006763c3c2eb04a3f6a3a9560e874b74e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Merge IVersionControl and VcsBasePlugin hierarchieshjk2020-01-317-265/+126
| | | | | | | | | | | | | | They were 1:1 in parallel, with quite a bit of function call ping-pong inbetween, for code-sharing-by-inheritance. Merge them by making VcsBasePlugin inherit IVersionControl and merge the derived classes below. Size of this patch is hard to avoid as all seven systems have to move simultaneously. Non-necessary potential follow-up cleanup have been left out on purpose. Change-Id: Icb71e4182af3db21069cc637e7ae87ffa3829791 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Several SettingsPages: Code cosmeticshjk2020-01-302-5/+3
| | | | | | | De-Q_OBJECT-ify, remove unnecessary #includes, final-ize, etc. Change-Id: I461d3e73400dacac90c22e7c84a40e3ea1718b6e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Vcs: Pimpl pluginshjk2020-01-247-127/+144
| | | | | | | | | | | | | | | Essentially rename all *Plugin into *PluginPrivate, and pull out the actual IPlugin related pieces into new *Plugin classes. Shift the construction of the PluginPrivate to initialize(), following the general pattern. I tried to keep the patch as mechanical as possible, giving room to some obvious but less mechanical cleanup needs, that are intentionally left out of this here. Change-Id: Iac662bf73338f9f7669064ed67b960246875c23c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Dissolve VcsManager::registerVersionControlhjk2020-01-221-1/+2
| | | | | | | | It's a somewhat unusual pattern, spelling it out will help to move the vcs plugins setup closer to the now-usual pattern. Change-Id: Ie7b70e52d75e34cd36b6a1d55ca868e3edab44a7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Dissolve VcsBaseOptionsPage intermediate hierarchy levelhjk2020-01-172-5/+4
| | | | | | | | It's effectively setting only three properties nowadays, not enough to justify a case of reuse-by-inheritance anymore. Change-Id: Ia0aedbd0dc460a70bed580a3402cf928c7221a77 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Compile fix with recent Qt devhjk2019-07-291-4/+1
| | | | | | | | | The reasoning in 1b4766e26c6b did not take into account that the scope of QT_NO_JAVA_STYLE_ITERATORS may change over time, as done with f70905448f6 in Qt base. Change-Id: Ib1966ff26c4d36d5f62e149d6b45baa4aecf825d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Add CommandLine convenience constructorshjk2019-07-231-3/+2
| | | | | | | | | | | | | ... taking a QString for the executable. This weakens the very explicit QString -> FileName conversion via the named constructors for the special case of constructing a CommandLine. I think that's worthwhile here, as it reduces the noise on the caller site under circumstance where the nature of the thing is obvious. Change-Id: I27b4a73639728893d053b2e7ba65cb745f0ffe83 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-2/+2
| | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Use CommandLine in ShellCommandhjk2019-06-111-1/+1
| | | | | | | ... and adapt users. Change-Id: I218523ffe34720d5fe199aa0ca6892a8dc2985fc Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use Utils::FilePath in SynchronousProcesshjk2019-06-111-1/+2
| | | | | | | Adapt callers and surrounding code. Change-Id: Ie6c1883a44169cf9d790d06b660f46d24dc24c89 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-283-3/+3
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-05-281-0/+17
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp src/plugins/qmldesigner/qmldesignerextension/timelineeditor/preseteditor.cpp src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp src/shared/qbs Change-Id: I369368de9b9c682b03e224d489589043e1f6782b
| * Revert "Perforce: Allow working with localhost server"Orgad Shaneh2019-05-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | It breaks the common use-case. Running p4 client -o in any directory returns Host, even if it is not managed by Perforce. This reverts commit 28f7c7935f4d142d5498d58465ff004462e996a6. Fixes: QTCREATORBUG-22458 Change-Id: Iaa84ff68e2c6d807c6c177ff2113b07380b4e5be Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Qt Creator CMake portCristian Adam2019-05-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Replace static_casts by QOverload where possiblehjk2019-02-261-1/+1
|/ | | | | | | | | Mainly to get rid of the QProcess::finished deprecation warning. Also adjust coding style in the surrounding connects when needed. Change-Id: I12f9b248c7974b892c4a069356e578e80f8c59e9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Perforce: Disable by defaultOrgad Shaneh2019-01-171-0/+1
| | | | | | | | VCS detection is expensive (it runs several processes), and Perforce is not widely used anyway. Change-Id: If231aef7b537dab934266e8e86ba90cb8ff1e196 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Perforce: Allow working with localhost serverOrgad Shaneh2019-01-111-17/+0
| | | | | | | It is useful for testing. Change-Id: If110853f2ec035ecb60fd4c19819a002c3282dda Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Perforce: Get top level also when env is setOrgad Shaneh2019-01-111-1/+1
| | | | | | Fixes: QTCREATORBUG-18771 Change-Id: Ic90f6a96ea6d978f7c36b188527b222a7a13f510 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Perforce: Fix soft assertionOrgad Shaneh2019-01-111-1/+2
| | | | | | Fixes: QTCREATORBUG-18404 Change-Id: I274f8cbc4512c5142d54a3b4faf39747bfa16bd8 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* VCS: Improve dialog on submit promptOrgad Shaneh2018-11-121-4/+1
| | | | | | | | | | | The dialog appears when closing the commit dialog without committing, or when "prompt to submit" setting is enabled. Fixes: QTCREATORBUG-18799 Change-Id: I8eb20becbcee7281b9f673a35ec698c6f8e04a40 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Perforce: ModernizeOrgad Shaneh2018-09-202-4/+5
| | | | | | | override, auto, nullptr Change-Id: I82f63fbe06d098e71876c30af0fe247a5bae3a55 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Perforce: Fix warnings and modernizeEike Ziller2018-08-285-18/+20
| | | | | Change-Id: Id43718869aaf2bc24e6a6614bcddcc35715502fe Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: Consolidate submit editor actions setupOrgad Shaneh2018-08-282-26/+2
| | | | | Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* VCS: Capitalize commitDisplayNameOrgad Shaneh2018-08-281-1/+1
| | | | | | | | To be used by the submit editor. Change-Id: I73fc13abfd37f207d92669c1893b7edda35ed1e4 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* VCS: Unify default and maximum timeout in all setting pagesOrgad Shaneh2018-06-191-0/+3
| | | | | | | Task-number: QTCREATORBUG-16009 Change-Id: Ibbaaef441ac2dc0147af2bc0631e0b0d98b4f57d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Vcs/Text search: Remove a few addAutoReleaseObject useshjk2018-02-063-8/+8
| | | | | | | Using a QObject parent suffices here. Change-Id: I4dc5448511d55bf14fbd8f810e91336a49e94094 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Core: make useMacShortcut constexprDavid Schulz2018-02-021-7/+7
| | | | | Change-Id: I293b96428784b6efecac6dae4f2f9690af0027da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* VCS: Offer to save-all before commitTobias Hunger2017-09-122-0/+8
| | | | | | Task-number: QTCREATORBUG-3857 Change-Id: I3ff3d90803eec4134b9da4af5567753ad7bffafb Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.4'Orgad Shaneh2017-08-301-1/+1
|\ | | | | | | Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
| * Fix copyright year in plugin info, --version, and macOS infoEike Ziller2017-08-241-1/+1
| | | | | | | | | | | | | | | | By using the new QTCREATOR_COPYRIGHT_YEAR variable Task-number: QTCREATORBUG-18612 Change-Id: I3bcf0319660d210436d3130c00f43325c460a66c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/4.4'Eike Ziller2017-07-251-12/+12
|\| | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
| * Plugins: Fix that mimetype definition was not valid JSONEike Ziller2017-07-251-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | JSON officially does not support multiline strings, so we should use the same mechanism that we already use for the plugin description (i.e. additionally support arrays of strings which are interpreted as lines). This just happens to work because Qt's JSON parser eats it without choking. Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | VcsManager: Register IVersionControls with VcsManagerTobias Hunger2017-07-101-1/+1
|/ | | | | | | Get some more objects out of the pool. Change-Id: Id93021b712307c4777dc39b9d15aa18a46318885 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* VCS: Set user choices on editor reloadOrgad Shaneh2017-06-191-1/+1
| | | | | | | | Broke by 2c6adc1e74. Change-Id: Iba435899c7b0da4b270f4ef8ece84c1839bf6b72 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Reduce usage of qApp in favor of static function callsAlessandro Portale2017-04-241-2/+2
| | | | | | | | | | | | Q*Application classes have unusually many static functions. In many cases in our code, these functions are unnecessarily called as instance functions, using the qApp helper. This patch replaces many occurencies of qApp with the according Q*Application classname. Change-Id: I6099a419fa7bf969891269c37ed7a9e817ef5124 Reviewed-by: hjk <hjk@qt.io>
* VCS: De-slotOrgad Shaneh2017-03-201-5/+11
| | | | | Change-Id: I805eb88dee7ec1243d59c32be23f2fb401f1f46e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 22:39:03 +0000