Tobias Hunger
1b83666d31
IVcsControl: Add additionalToolsPath()
...
Add a method for a VCS to tell creator where it installed additional
tools that it came with. This is useful for e.g. git on windows
which ships with a nice bunch of unix tools.
Change-Id: Ibc5f2fb57307bfadad140bd57d83917e56d57153
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2014-03-05 14:00:21 +01:00
Orgad Shaneh
ba08dd3937
IVersionControl: Fix documentation
...
Change-Id: I35544e872503e5c32307101d3483293241d29a5d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
2014-02-19 14:52:16 +01:00
Orgad Shaneh
cd48c5e513
IVersionControl: Implement topic cache in the base class
...
Derivatives need to derive TopicCache, implement its pure virtual
functions and pass it in IVersionControl's constructor.
Change-Id: I3a904c84541fda95eee75296f86441c4bae55d79
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-02-19 09:25:31 +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
Tobias Hunger
f82b12e36c
VcsManager: Add unit tests
...
Add some unit tests to the VcsManager to test the detection and
caching of version control systems.
Change-Id: I2b3f9218c12aebde8a8120fc869efc76c36ae41a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-12-10 16:31:45 +01:00
Knut Petter Svendsen
16b4c2e032
ClearCase: Handle read-only view private files
...
View private files have state NotManaged. In the corner case
where a NotManaged file is read-only they should be made
writeable by the ReadOnlyFilesDialog, and not vcsOpen()-ed.
Change-Id: Icfeab6bebb76cc01da693b3bfff7b46c45b106b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-11-13 15:31:31 +01: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
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
Mathias Hasselmann
fd6d0d8c29
ProjectExplorer: Show VCS topic in tree
...
Topic is usually the current branch name
Change-Id: Id6ecc48744a5b3d9c7502b36b4895eb18d0ff0c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2012-11-16 14:11:08 +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
Orgad Shaneh
1faea8a0b3
Read-only file dialog: Use VCS terms if applicable
...
Also add keyboard accelerators
Change-Id: Icea8af6af7e5d94623ba7782c375977bbab17f22
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2012-09-04 16:02:23 +02:00
