summaryrefslogtreecommitdiff
path: root/src/plugins/clearcase
Commit message (Collapse)AuthorAgeFilesLines
* Clear Case: fix UI textLeena Miettinen2015-10-222-4/+4
| | | | | Change-Id: Ic9b0481287a30312209bc84c1190e97087495e0f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ClearCase: replace link with text URLLeena Miettinen2015-07-061-4/+4
| | | | | | | | | | ...because Qt Creator blocks external links. Also remove the word "Please", to follow the UI text guidelines. Change-Id: I060035367ede54c3915f5396ffb42c7be73b729d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ClearCase: Persist save keep file on undo checkoutKnut Petter Svendsen2015-06-113-11/+22
| | | | | | | | | | When undoing checkout on a modified file the user is prompted to preserve the contents of the checked-out version under a file-name of the form element-name.keep. Save the user's choice and use it on subsequent undo checkout actions. Change-Id: I26a73c7f1f456ae0cf1cad6741d30ff2aab4bf3f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ClearCase: Add setting to not prompt for commentKnut Petter Svendsen2015-06-117-18/+59
| | | | | Change-Id: I30807991e2a839088c9523280eab1dacd22a1bf4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-092-4/+5
| | | | | 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-17/+17
| | | | | | | Do this in a separate step to keep the next patch more readable. Change-Id: I37cfd5481dcbfda52135eccec30852aefde1b950 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Split up VcsCommandTobias Hunger2015-05-042-12/+18
| | | | | | | | | 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>
* Vcs: Standardize on second based timeoutsTobias Hunger2015-04-134-51/+44
| | | | | Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-04-021-2/+2
|\ | | | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginview.cpp Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
| * Don't mix iterator and const_iteratorKai Koehne2015-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | This avoids unnecessary detaches of the Qt container data. The mismatches where detected by defining QT_STRICT_ITERATORS; however, this define violates the ODR (causing linker errors), and therefore is not added permanently. Change-Id: Idd336a9c8b394214a820437ef1b92d2101f6101c GPush-Base: 62b0848b9cf357bcded4184c71d490bae56c773b Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* | VCS: Rename DiffHighlighter -> DiffAndLogHighlighterOrgad Shaneh2015-03-251-1/+1
|/ | | | | | | It is also used for log editors Change-Id: I8755d2aaa717ca47b0d9bbf935b121d4e099ef1b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Vcs: fix missing icons in SubmitFileModelHugues Delorme2015-03-111-1/+2
| | | | | | | | | | | | | In SubmitFileModel, filetype icons are missing for not "overlaid" icons in Core::FileIconProvider. This is fixed by ensuring valid file paths are passed to QFileInfo. VcsBase::SubmitFileModel has now a "repositoryRoot" property so it can constructs absolute file paths. VcsBaseSubmitEditor::setFileModel() now relies on SubmitFileModel::repositoryRoot() instead of passing this info as annex parameter. Change-Id: Ie045c3a7b247a5b5d48d10aaaf67cb3fdcf9fa7e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: rename overload SubmitEditor::diffSelectedFiles() for rowsHugues Delorme2015-03-061-1/+2
| | | | | | | | | | | -> Renamed to diffSelectedRows() This allows to use easily Qt5 connects, without ugly casting to pick the right overload Change-Id: Ifaa0242febccb4e1aadd53470cc4b3be79b07c18 Reviewed-by: Orgad Shaneh <orgads@gmail.com> (cherry picked from commit 12fac12e8f78ed8770b90ae9f2aa80e1e78ee68c)
* Prefix duplicate names in Open Documents to make them uniqueOrgad Shaneh2015-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | If a document has a file name associated with it then the prefix is composed from path components (subdirectories), starting from the one where the file is located and going up the parents until the resulting name becomes unique among other open documents. If a document doesn't have an associated file name, then a sequential number (starting from 1) is appended to the display name of the document. This feature is useful when working with big projects that have lots of idendical file names across different subdirectories (e.g. Makefile.in, main.cpp, etc.) that need to be edited at the same time. It allows to easily recognize such a file when switching between documents in the editor, w/o the need to place the mouse pointer over the name entry to get its full path. Started-by: Dmitriy Kuminov <coding@dmik.org> Task-number: QTCREATORBUG-10185 Change-Id: I633ea6d9b9b4fce8b67335dbcce1bda29254efde Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Clean exported headers of the TextEditor plugin.Friedemann Kleint2015-02-261-0/+1
| | | | | Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ClearCaseSettings: initialize memberNikita Baryshnikov2015-02-251-1/+2
| | | | | Change-Id: Ib43dbddd64bb179f65d25705757682f6a8088af0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use new mime databaseEike Ziller2015-02-171-3/+3
| | | | | Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Core: Use FileName for DocumentModel::Entry::fileNameOrgad Shaneh2015-02-161-1/+1
| | | | | Change-Id: I81d0aea2354a9d0461646590f06bb38bd4366f29 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ClearCase: Do not use ProjectTree::currentProjectTobias Hunger2015-02-161-5/+9
| | | | | | | | | | | | | That is almost certainly not what you want:-) Use SessionManager::startupProject instead. Also use state changed from QApplication in favor of having the mainwindow notify us about updates. That does no longer work, now that we have multiple windows. Change-Id: I27563c8e060ea154c0db5e5777d4b92840f31fa7 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1226-153/+153
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1626-153/+153
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Misc: Remove unneeded qualificationsOrgad Shaneh2015-02-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* | Use new qt5 connect apiMontel Laurent2015-01-291-4/+7
| | | | | | | | | | Change-Id: I6c0d4ec60759b3c2fedac3e6649b7ec5102a6487 Reviewed-by: hjk <hjk@theqtcompany.com>
* | ClearCase: WS-only changeTobias Hunger2015-01-261-5/+5
| | | | | | | | | | Change-Id: I9ce7debe597776a709098935b2289df8accca54a Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | ClearCase: Sprinkle with autoTobias Hunger2015-01-225-20/+16
| | | | | | | | | | Change-Id: Ia003b873cf4802df506ab6090dbb93858d7526d0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | VcsCommand: Use Qt5-style connectsTobias Hunger2015-01-201-2/+3
| | | | | | | | | | Change-Id: I81688ce998bf9f8d47b7d88e639699b626be90dd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Vcs: Remove unused GetRepositoryRootOperationTobias Hunger2015-01-194-13/+0
| | | | | | | | | | Change-Id: I2443aef788c75a96ba19e2499dfb3f17c201d468 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Core: Remove unused functionality to checkout from VCSTobias Hunger2015-01-152-7/+0
| | | | | | | | | | Change-Id: I1ee17142e14200c5ae9597bbf9bee3f3978704f4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-121-1/+1
| | | | | | | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Merge remote-tracking branch 'origin/3.3'Eike Ziller2015-01-082-0/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cppeditor/cppdocumentationcommenthelper.cpp Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
| * ClearCase: Fix not detecting that a file is already checked outKnut Petter Svendsen2015-01-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | ClearCase violates POSIX since it gives a file a new inode when checked out. This gives QtCreator problems with noticing that a file has changed permissions to writeable and thus it will insist on trying to check out the file again in some cases. Change-Id: Ia3f621daff258b3ea5d9ff4f5cec7629ca46e6bd Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * ClearCase: Set focus on Ok buttonKnut Petter Svendsen2015-01-031-0/+3
| | | | | | | | | | Change-Id: I7d872f90bce914100c912db4c310001b8597b102 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Completely rework currentNode/currentProject handlingDaniel Teske2014-12-031-4/+4
|/ | | | | | | | | | | Centralize the handling inside a new class ProjectTree. React to moving focus and remove most special handling. This properly fixes the linked task. Task-number: QTCREATORBUG-13357 Change-Id: I6b06aa32b1e4305ec8a6d432857b302585d8734b Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* VCS: Rework disabling of ambiguous actionsOrgad Shaneh2014-11-171-20/+22
| | | | | | Task-number: QTCREATORBUG-13364 Change-Id: Ib9dc98964983f1a2808a89d90969089a09d2b55e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-2/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* ClearCase: change QTC_CHECK to QTC_ASSERT and remove dead stores.Erik Verbruggen2014-10-161-4/+4
| | | | | | | | | | | When the QTC_CHECK would fail, a nullptr deref would happen directly after the check. The dead stores are not harmfull, but add noise when checking for dead stores that are due to logic errors. Change-Id: I8285b1b3d941491b581536a7a10678cab7e0ade4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* License update.Eike Ziller2014-10-151-1/+1
| | | | | Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-1425-175/+200
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License updateEike Ziller2014-10-0926-177/+202
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-161-7/+10
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
| * ClearCase: Fix unreserved checkoutOrgad Shaneh2014-09-151-2/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-12847 Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * ClearCase: Initialize checkout dialog after sync has finishedOrgad Shaneh2014-09-101-5/+6
| | | | | | | | | | | | | | | | If it is initialized too early, activities combo is empty. Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | ClearCase: Use check out comment on check inOrgad Shaneh2014-09-152-2/+11
| | | | | | | | | | | | Task-number: QTCREATORBUG-12846 Change-Id: I02b3d713df8cc0e28d1bd32a401f692460c5fdbd Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | ClearCase: Remove superfluous #ifdefsOrgad Shaneh2014-09-082-4/+0
| | | | | | | | | | Change-Id: I60b091acc3d3d4ee810341a4d9c6067783840f86 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Replace QLatin1String("x") with QLatin1Char('x') where possibleKai Koehne2014-09-041-1/+1
| | | | | | | | | | Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232 Reviewed-by: hjk <hjk121@nokiamail.com>
* | ClearCase: Use platform specifier for plugin enabled stateEike Ziller2014-09-042-4/+1
| | | | | | | | | | Change-Id: Ib8ba95c8bf7b5fc6bdfdcd1fd4f18b20eb63d5b7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Editors: Automatically add editor/document id to context and use thatEike Ziller2014-09-022-6/+1
| | | | | | | | | | | | | | instead of manually adding a context everywhere. Change-Id: I4336015a6d19349171a255e949da89b0013d6700 Reviewed-by: hjk <hjk121@nokiamail.com>
* | ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-023-18/+21
| | | | | | | | | | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | Vcs: Collapse VcsSubmitEditorFactory hierarchyhjk2014-09-015-14/+10
| | | | | | | | | | | | | | Same pattern as for VcsSubmitFactory. Change-Id: I7adb8868a83842c1b6c642db372a3624dd2e879e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
View Lorry Controller Status