feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
47,448 Commits 108 Branches 368 Tags
c44e5826e7f15ddd34b741c0a95d3541d526076f
Commit Graph

45 Commits

Author SHA1 Message Date
Christian Stenger
361ea24629 ClearCase: Fix plugin unit tests 
This function is called by QMetaObject::invokeMethod.

Broke with f62663e8e4.

Change-Id: I0efc2f24043e0313d500840e6022f3d73ca8a127
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-03-10 14:10:24 +00:00
Orgad Shaneh
e868357107 VCS: Reslot describe functions 
They're used by VcsEditorFactory

Change-Id: I9211f406b389649bf8ff9fe7f24522026b1711d4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-12 12:32:06 +00:00
Tobias Hunger
f62663e8e4 Polish: Remove some more useless "slots" from headers 
Change-Id: I9ba3b93e53e63153c1573d51c1aac53b7e088362
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-02-10 15:02:05 +00:00
Tobias Hunger
9b3016c2e4 ClearCase: Modernize 
* Use pragma once
* Use static member initialization

Change-Id: Icec025b7c3b310286c675cef30cf01e220002ca8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-02-04 10:40:19 +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
Christian Stenger
7d6aef484e ClearCase: Make updateStatusActions() a slot again 
Change-Id: Iafbf78b16a09041bbabd248dfce4434df87dd5b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-11-30 08:22:30 +00:00
Tobias Hunger
b10766e4de ClearCase: Use Qt5-style connects 
The heavy lifting was handled by clazy.

Change-Id: Ic86f3d5b16cd60361e68b7915595056a68f5a9ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-11-23 09:01:06 +00:00
Tobias Hunger
eec0a03212 Vcs: Split up VcsCommand 
Move the biggest chunk into Utils::ShellCommand, add some Qt Creator
specific magic in Core::ShellCommand and leave the rest in
VcsBase::VcsCommand.

Change-Id: I5fe6f7076e96023ad2164bcfaacfb3b65a7ff8a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-04 15:27:25 +00:00
Tobias Hunger
7719fb669c Vcs: Standardize on second based timeouts 
Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-13 10:47:08 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
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
 2015-02-12 17:29:21 +01:00
Tobias Hunger
262f7f428f Vcs: Remove unused GetRepositoryRootOperation 
Change-Id: I2443aef788c75a96ba19e2499dfb3f17c201d468
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-19 10:20:12 +01: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
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02: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
Orgad Shaneh
0188b74a65 ClearCase: Use check out comment on check in 
Task-number: QTCREATORBUG-12846
Change-Id: I02b3d713df8cc0e28d1bd32a401f692460c5fdbd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-15 15:15:26 +02:00
Orgad Shaneh
dafaab25bd VCS: Introduce NoOutput command flag 
Suppresses all kinds of output

Change-Id: I3bd2173fc3efcfcc2ce7434d9545cd1492d7c0ab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-12 12:42:40 +01:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin 
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-01-14 07:43:00 +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
Knut Petter Svendsen
c5a8e15b70 ClearCase: Give warning if editing a Derived Object 
Derived objects (DO) are created during builds with ClearCase build
tools (e.g., clearmake). They are used for build avoidance and derived
object sharing. DOs are typically object files, but can also be source
code generated from code generation tools. It is probably never a good
idea to edit such a file.

Change-Id: If4248f09409424ee771aab720851bb6ce1aa40c9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-05 13:48:04 +01:00
Knut Petter Svendsen
48fdbe244d ClearCase: Handle Derived Objects 
Derived Objects (DO) should not be checked in or out. Ideally they should
not be edited at all, but in the case where a user by accident opens
a DO and it is read only do not offer to vcsOpen() the file.

Change-Id: I5aee9655ca8696c6d7291950946052261526c751
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-05 13:47:47 +01:00
Knut Petter Svendsen
0bb76dc984 ClearCase: Improved performance for indexing dynamic views 
For dynamic views we only at initial sync/indexing check for checked out
files. When a file is opened it will be reindexed if needed. The very time
consuming recursive listing of all vobs is not needed as for snapshot
views.

Change-Id: I83d4ab70efdd311b6f3239ab45569c6d1810e10f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-05 13:47:25 +01:00
Knut Petter Svendsen
6277bdbff6 ClearCase: Refactor and add tests 
Refactored code to make it more testable, and added tests. When running
WITH_TESTS the TestCases will make the plugin fake ClearTool such that
ClearTool is not needed to run the current tests.

Change-Id: I49b50a667309cf337a07ef20dabb4801c680700d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-12-05 13:33:50 +01:00
Orgad Shaneh
fdb6ef90fc VCS: Do not try to add files that are already tracked 
Task-number: QTCREATORBUG-2455
Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-11 12:43:25 +02:00
Orgad Shaneh
7b08d993bf VCS: Pass workingDirectory for annotate 
Required for supporting renames on annotate.

The renamed file (and possibly its parent directory) doesn't exist
anymore, so it shouldn't be passed as a working directory.

Change-Id: I809e8df17c1dc5199e533b525244a668eccbcd5f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-10 18:59:43 +02:00
hjk
98917598d3 ProjectManager: Use Core::Id for progress types 
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-04 14:59:06 +02:00
Knut Petter Svendsen
c222a4f623 ClearCase: Fix checking if a directory is managed 
Now both dynamic and snapshot views are supported under both
Unix/Linux and Windows.

The implementation is based on "cleartool pwv" which gets the
working view.

Change-Id: I0d21d2c84fae4a641a3bac8b1087cfeffb89c447
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
 2013-04-30 11:44:17 +02:00
Eike Ziller
e31575a493 VCS: Clean up submit editor handling 
It was not possible to simultaneously open two commit editors for
different version control systems, also there was no reason to scan all
open editors for the submit editor, since the plugins can just remember
the editor that they opened.

Change-Id: I1bea6ece3cd6faa1ecc0566bdd6f5fb10c816963
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-04-19 16:21:06 +02:00
Knut Petter Svendsen
0d3b54f410 ClearCase: Don't show Hijack button for dynamic view 
The Hijack button (makeWriteableButton) should only
be shown for snapshot views.

Change-Id: I809981885d18b6057d82f73b5104b0f1041cd255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-03-11 14:18:51 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Orgad Shaneh
7cb80f0e16 VCS: Use entries combobox for log 
Tests included

Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-30 10:26:31 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
7b39f41c05 VCS: Refactor fileNameFromDiffSpecification 
Use diff file pattern to match file name. Avoid duplication.

Include unit tests for Git

Change-Id: Ib68a08368270a27976a3e16bdd1cb219a52b8889
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-21 12:19:55 +01:00
Orgad Shaneh
5df4732f35 ClearCase: Refactor ccGetView() 
Change-Id: Ia3caa47a701fd58c07f9f463bb282cf0be3807ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-30 11:04:33 +01:00
Eike Ziller
3e7d94c362 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
 2012-11-16 15:31:02 +01:00
Orgad Shaneh
3f44c6d0be ClearCase: Fix race condition 
setStatus() is invoked in the main thread, but the
status change is tested for in the sync thread...

Change-Id: Ib322e12e7d40dafa6b60f3a73a202e8e1dcbfb53
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:13:14 +01:00
Orgad Shaneh
89ae89195d ClearCase: Report current view 
Change-Id: I1082ccdf7e38f9c8e03f713b3f3244a48d8eb523
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-11-16 14:11:32 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Knut Petter Svendsen
d1ef970a19 Add support for base ClearCase. 
Current implementation only works for UCM views, which is a bug.
UCM is layered on top of base ClearCase. UCM has concepts such as
projects, streams and activities. When a view is base ClearCase
disable all prompting for activity, UCM menu entries and dialogs.

Change-Id: I81fb1a014373ece97d3f681623d314344a59b75a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2012-09-24 16:51:56 +02:00
Knut Petter Svendsen
8676b58fb4 ClearCase: Hijacked files are only relevant for snapshot views 
Change-Id: I92959a83e74aceb693678fa74dc2bcdde83ad8d3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2012-09-24 16:38:58 +02:00
Orgad Shaneh
80502c610f ClearCase: Fix Check-In for external files 
Change-Id: Ic1edf63e7fe1667e7e3b59a610ba77bfe6308a2c
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-09-12 10:33:06 +02:00
Orgad Shaneh
05b7a06bce ClearCase: Fix threading issues 
* Menu parameters were set (and enabled/disabled) from non-GUI thread
* Access to statusMap was not thread-safe

Change-Id: I029cb7090af87903c599bb3fcc1cba93e196d45e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-09-03 12:24:51 +02:00
Orgad Shaneh
e371008cd1 ClearCase: Rename activityMutex -> m_activityMutex 
Change-Id: I6bf87d313e5466ad782ed06662d5fe0039a79491
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-09-03 12:22:45 +02:00
Tobias Hunger
8bff3cced2 ClearCase: Small cleanups (no code changes) 
Change-Id: Iaf0292f6f494102ab617cd6127f19c2d6b33e8fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-08-22 16:19:13 +02:00
Orgad Shaneh
647071d84b Introduce ClearCase plugin 
Change-Id: Ib2cebaff0f035f48ca958cad16dedfdd80f4bff9
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-18 19:42:57 +02:00