aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Move mimetype definitions to plugin specsEike Ziller2017-02-276-22/+14
| | | | | | | | | | | | - Avoids the hassle of QRC files and manually registering mime types - Avoids performance regressions because of mime types that are registered after mime database has been used - Makes it technically possible to detect that a disabled plugin could handle a mime type if it was enabled Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Utils: Introduce a TemporaryDirectory and TemporaryFile classTobias Hunger2017-01-201-5/+2
| | | | | | | | Both wrap the corresponding Qt class, but make sure all temporary files or directories are created inside a "master temporary directory". Change-Id: I55461be507c828c965224c02863ea5ed9bbf9498 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* VCS: Use Qt5 connect for annotateOrgad Shaneh2016-11-282-4/+1
| | | | | | | Connect directly to the editor widget, which has a strong type. Change-Id: I4d9778bc4a3c8ba1b37c5a5c0286fd72cda135de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* VCS: Replace describe slots with lambdasOrgad Shaneh2016-11-282-3/+6
| | | | | Change-Id: I05ca25aad8be43fdfa15d3fb5eaaa9bf753ee79f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Rename VcsBaseEditorParameterWidget -> VcsBaseEditorConfigOrgad Shaneh2016-10-241-11/+10
| | | | | | Change-Id: I5626e66ba2b7a760ce55263edce9e716067ea6a4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* VCS: Replace QToolButtons in VCS toolbar with QActionsJarek Kobus2016-10-241-5/+6
| | | | | | | | | | | | Change VcsBaseEditorParameterWidget to add actions/widgets to an existing toolbar, instead of being a widget itself. The class is renamed in a follow-up commit. Task-number: QTCREATORBUG-14934 Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* VCS: Add a way to filter out files/directories that belong to a VCSTobias Hunger2016-10-212-0/+7
| | | | | Change-Id: I4dcbe6242cfe327e3b72d3dd550309be45e326a9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* VCS: "final"-ize IVersionControl implementationsTobias Hunger2016-10-211-16/+16
| | | | | Change-Id: I123a8da9b08b2fe5de679d5caac7fa20bfb0ef4a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove uses of deprecated QProcess::error signalOrgad Shaneh2016-08-091-2/+1
| | | | | | | | | This overload of error is deprecated in 5.6. Replace with errorOccurred, which was introduced in 5.6. Change-Id: Iccfba7e7103b7ce377471696f1f2ec217e52c840 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* UI files: Fix tab order in lots of UI formsNazar Gerasymchuk2016-08-021-0/+6
| | | | | | | | | | For unknown reasons tab order in listed UI files was set incorrectly and behave unexpectedly. Now tab order behave naturally. Changes made for listed objects and touches only UI. Change-Id: I057b95eb21943ddb29b108682618382661db7be9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* SynchronousProcess: Store raw bytes from stdout/stderr of the processTobias Hunger2016-07-151-2/+2
| | | | | | | | | | | | | | | Only convert the raw output later in a stdOut() and stdErr() method of the SynchronousProcessResponse. This is necessary since we have processes that use different encodings for different sections of the file (I am looking at you, git). Also remove the signals for raw data on stdout/stderr, leaving only the signals returning buffered QString lines. This should be safe, even with UTF-16 output. Change-Id: Ida613fa86d1468cbd33bc6b3a1506a849c2d1c0a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Perforce: fixed invalid setTopLevel callsCristian Adam2016-05-191-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using P4CONFIG one can user multiple p4 workspaces. For every workspace one needs to have a p4config.txt file, which contains the P4CLIENT, P4USER, P4PORT variable values. Qt Creator will query on various directories for p4 configuration. "p4 client" command will give an error if a p4config.txt file is not present. p4 will try to connect to localhost when P4PORT is not set and give and error, but it will take a long time to timeout. This timeout gives the impression that P4 does a lot of work and Qt Creator will sometimes freeze. The solution to this timeout is to set P4PORT and P4USER. In this case "p4 client" will give back the same generic "Root:" variable e.g. c:\p4, which will be seen as a valid path and PerforcePlugin::setTopLevel will be called and thus setting the path of the current workspace, which is not valid. Fortunately in this case "Client:" and "Host:" variables in the output given by the "p4 client" have the same value. "Client:" will probably never have the same value as the "Host:" value, thus making it safe to ignore these invalid "p4 client" calls. Change-Id: Iafb2640cccd7bd10c455d33ea9d36c5eae2e2951 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix up QProcess::waitForFinished()Tobias Hunger2016-05-112-3/+3
| | | | | | | | waitForFinish returns false if the process is no longer running at the time of the call. Handle that throughout the codebase. Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094 Reviewed-by: hjk <hjk@theqtcompany.com>
* Perforce: ModernizeTobias Hunger2016-02-1024-298/+113
| | | | | | | | | | * use pragma once * remove debug code * Remove some "slots" * Use Qt5 style connects (almost everywhere) Change-Id: Iaa9c3bbacbb2be3c96502c52cc169ad4ec7015a5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-1924-394/+279
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* IDocument: Rename defaultPath and suggestedFileNameEike Ziller2016-01-141-1/+1
| | | | | | | | To fallbackSaveAsPath and fallbackSaveAsFileName. That makes it clearer what they are for, and that they actually belong to each other. Change-Id: Ie5b83b9db77d39a7fe9e979cc8f22b7f5b9101a3 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Perforce: Complete Qt5 connectsOrgad Shaneh2015-11-202-11/+9
| | | | | Change-Id: Ifdcda2c529fc2b6c0313a6d0b521694d0ab32012 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Perforce: Use Qt5-style connectsTobias Hunger2015-11-206-38/+36
| | | | | | | The heavy lifting was done by clazy. Change-Id: I3617564f4cff494423c42c1665a4e54c503101c2 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Perforce: Reduced delay before submit dialog is shownCristian Adam2015-07-211-7/+6
| | | | | | | | | | | | | | Qt Creator's Perforce plugin uses "fstat" command to gather the files in the project. This takes ~40 seconds on a 12.000 files project. By using "files" command the operation of gathering the files in the project takes ~1 second. Change-Id: Id8257d33a5dda2e06f0f365d5e3b30a49a094483 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
* Perforce: Diff for files in submit changelist dialog worksCristian Adam2015-07-212-4/+2
| | | | | | | | | | | Perforce repositories configured with P4CONFIG had a bug in the submit dialog, one could not see the differences for the submited files. Change-Id: Ie15fd66667dca1c0863a29e87ff76583d9aa3bbb Task-number: QTCREATORBUG-14538 Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* VcsBase: Make some slots protected and update users accordinglyTobias Hunger2015-06-111-1/+1
| | | | | Change-Id: If38be72e9037126b6b697c5064a07de29a2ef8e5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-092-7/+8
| | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* IVersionControl: Add method to get a ShellCommand for initial checkoutsTobias Hunger2015-05-111-0/+1
| | | | | Change-Id: Iabc056dad186d788003b221afb34303c37fef728 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Sprinkle overrides over IVersionControlsTobias Hunger2015-05-081-16/+16
| | | | | | | Do this in a separate step to keep the next patch more readable. Change-Id: I37cfd5481dcbfda52135eccec30852aefde1b950 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 14:25:45 +0000