aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce/perforcechecker.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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: 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>
* 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>
* 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-111-2/+2
| | | | | | | | 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-101-7/+1
| | | | | | | | | | * 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-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Perforce: Use Qt5-style connectsTobias Hunger2015-11-201-1/+1
| | | | | | | The heavy lifting was done by clazy. Change-Id: I3617564f4cff494423c42c1665a4e54c503101c2 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Perforce: Ability to use multiple workspaces/projectsCristian Adam2015-05-051-1/+11
| | | | | | | | | | | | | By the use of P4CONFIG (p4config.txt) one can now specify workspace details (P4USER, P4CLIENT, P4PORT) individually for specific projects. Previously one had to reconfigure Qt Creator in Settings for every workspace switch. Change-Id: I117829ab3cf592562a4662f85314aa3c125e7610 Task-number: QTCREATORBUG-14378 Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Fix printing of seconds and millisecondsTobias Hunger2015-04-151-1/+1
| | | | | | | We use a space between the number and the unit and use 'ms' or 's'. Change-Id: I689a8639c2d33c2f97789455b1e05693be0b2ccb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Convert to new connect apiMontel Laurent2015-01-301-4/+4
|/ | | | | Change-Id: I80aad51340bcde953763dec36cf989d6e19d4cd0 Reviewed-by: hjk <hjk@theqtcompany.com>
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-031-2/+1
| | | | | | | | Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-6/+6
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Kill process correctly in PerforceChecker dtor.Daniel Molkentin2011-07-201-0/+2
| | | | | | | | | | Caused a warning from QProcess when closing Creator right after start and p4 would time out due to incorrect settings. Change-Id: I3407d900522f86f12dfedb8c1aeda361017a3e89 Reviewed-on: http://codereview.qt.nokia.com/1884 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* VCS: Windows slash display fixing spree.Friedemann Kleint2010-07-051-5/+10
| | | | Task-number: QTCREATORBUG-1795
* VCS[Subversion/Perforce]: Fix VCSManager caching (Windows).Friedemann Kleint2010-05-201-1/+2
| | | | | | | | | Ensure clean paths are returned by IVersionControl::findTopLevelForDirectory() as otherwise caching of VCSManager breaks (Windows) and commands are executed all over again. Fix display in SVN/CVS. Acked-by: con
* Long live the king!hjk2010-03-051-1/+1
|
* VCS: Fix time-out handling for synchronous processes.Friedemann Kleint2010-03-011-13/+3
| | | | | | | | | | Introduce static utilities to Utils::SynchronousProcess for synchronous processes that mimicks the handling of Utils::SynchronousProcess (apply timeout after no more data are available on stdout/stderr as opposed to waitForFinished()). Task-number: QTCREATORBUG-777
* Tr()-fixes.Friedemann Kleint2010-02-261-0/+1
|
* Perforce: Use new VCSBasePlugin class.Friedemann Kleint2009-12-111-0/+217
Use relative paths with -d-option, check for symlinked depots. Add revert-actions. Use different context/kinds for editors, suppressing warnings. Introduce common run-function.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 10:46:02 +0000