summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Indentation and matching brace insertion for the CMake editorJan Dalheimer2015-09-261-1/+6
| | | | | | | | | Adds the following improvements to the CMake editor: * Indentation support (both through Ctrl+I and when pressing enter) * Insertion of matching paranthesis and quotes (pressing '(' inserts ')') Change-Id: If9a63b08b3e0897989e4d8ac69e3acc072b0b825 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Add override to IDocument hierarchyEike Ziller2015-06-111-2/+2
| | | | | Change-Id: I6884f59fe0f06e380254c1f8076dd561d9df4ee3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-091-2/+2
| | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Make it possible to register multiple cmake instancesBenjamin Zeller2015-02-241-2/+2
| | | | | | | | | | | This patch add the CMakeToolManager, a central repository for cmake instances. One instance is always the currently used "default". By that its possible to switch between different cmake installations. The next step will be adding it to the Kits. Change-Id: I310fdd805e0ed239077a5632303e891dbd1d9ea1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* TextEditor: Simplify configuring generic highlighterEike Ziller2015-02-161-1/+1
| | | | | | | | | | | | | * configureMimeType -> configureGenericHighlighter, since that is what it actually does. * setupAsPlainEditor -> setupGenericHighlighter, since that is what it actually does * avoid multiple highlighting definition lookups * unify code paths by not separately creating generic highlighters through the factories Change-Id: I9579ca5736bbf08c01b8e41b63c6b9f36bdc725e Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: Use FileName for Node::pathOrgad Shaneh2015-02-131-1/+1
| | | | | | Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eike Ziller <eike.ziller@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>
* | Replace QFileInfo::fileName() with FileName::fileName()Orgad Shaneh2015-01-291-1/+1
| | | | | | | | | | Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d Reviewed-by: hjk <hjk@theqtcompany.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-121-6/+4
|/ | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* CMake: Fix syntax highlighting for cmake filesDaniel Teske2014-12-151-1/+1
| | | | | | | | | | | | | | The newest kate definition files for cmake contain no mimetype for the cmake definitions, which lead to us not finding the right definition. Instead add a method to find the definition based on the name, which is not as generic, but we know which one we want for cmake anyway. Task-number: QTCREATORBUG-13588 Change-Id: Ib57fe531a225310c32ca1ef909a31bd7f52c612f Reviewed-by: Guilhem Vallat <guilhem.vallat@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possiblehjk2014-11-031-1/+1
| | | | | | | | Faster. Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81 Reviewed-by: Marc Reilly <marc.reilly@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* TextEditor: Factory cosmeticshjk2014-10-151-6/+2
| | | | | | | Pimpl, add some convenience setters. Change-Id: I525c080179fddab6fe2bd2270505fdbf33e56be2 Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | TextEditor: Move CompletionAssistProvider constructionhjk2014-10-061-2/+3
| | | | | | | | | | | | | | | | | | ... to the editor factories and pass it to the document, not the widget. Saves some code, puts fewer objects into the object pool. Change-Id: Iaaf250af74dc4e0c62700873accbb40ba88b7d9e Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* | TextEditor: Rename BaseTextEditorWidget to TextEditorWidgethjk2014-09-291-1/+1
| | | | | | | | | | | | | | ... and some of the related implementation details Change-Id: I1f03aa5acf2d3fb2cfc2a6a7845f3d3578b0408d Reviewed-by: David Schulz <david.schulz@digia.com>
* | TextEditor: More BaseText* -> Text* renamingshjk2014-09-261-1/+1
| | | | | | | | | | | | | | *Document* and *Layout* classes, all basetext* files Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ProjectExplorer: Apply static pattern to ProjectExplorerPluginhjk2014-09-261-1/+1
| | | | | | | | | | | | | | Adjust caller sites and surroundings. Change-Id: I6c3c80e42f35eabedc1f89c8c42cca1025aca12f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Rename {Core,TextEditor},{Base,}TextDocument classeshjk2014-09-251-2/+2
| | | | | | | | | | | | | | | | | | First step of some more 'Base' removal in TextEditor. s/Core::TextDocument/Core::BaseTextDocument/ s/TextEditor::BaseTextDocument/TextEditor::TextDocument/ Change-Id: I71ba325a2f0ad72ec9dae0d96846cbae72d326f7 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Core: Use std::function for info bar callbackshjk2014-09-041-14/+11
| | | | | | | | | | Change-Id: Iae7cbef053bfe86a7692e09f66af91117815d2a6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Flip default to 'duplicatedSupported'hjk2014-09-031-1/+0
| | | | | | | | | | | | | | opt-out now, for all editors created by BaseTextEditorFactories. Change-Id: I01d0a9ff26320fcd0b84ff90ff22c747cf84b84c Reviewed-by: hjk <hjk121@nokiamail.com>
* | TextEditor: Move CompletionAssistProvider to *Widgethjk2014-09-031-1/+1
| | | | | | | | | | | | | | All the others live there, too. Change-Id: I0a418bf235343d40a53fbee089234765386ee05d Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Editors: Automatically add editor/document id to context and use thatEike Ziller2014-09-021-4/+2
| | | | | | | | | | | | | | instead of manually adding a context everywhere. Change-Id: I4336015a6d19349171a255e949da89b0013d6700 Reviewed-by: hjk <hjk121@nokiamail.com>
* | TextEditor: Move comment definitions back to *Widgethjk2014-09-021-1/+1
| | | | | | | | | | | | | | Only used there, and avoids back-links to editors. Change-Id: I81206057ce89d42aef7febb840cf9e44b869df0e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Remove some *Widget::createEditor implementationhjk2014-08-281-6/+0
| | | | | | | | | | | | | | | | This removes the ones that were not to be used anymore. The fallback in the base class is left in for now. Change-Id: I5e7ab16497a83eff9b11deb9e1feb390757eac0e Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Introduce some convenience text accessors in the editorhjk2014-08-271-7/+6
| | | | | | | | | | | | | | And adjust users. Change-Id: I9329257cfa5f3298731deb07c2881bc37d9a051d Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | CMakeProjectManager: Use a BaseEditorFactory derived classhjk2014-08-251-35/+43
| | | | | | | | | | Change-Id: Ia5f2b789d82c63552ec7abe5ec22bbc29100a59a Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | CMakeProjectManager: General editor related code consolidationhjk2014-08-201-36/+72
| | | | | | | | | | | | | | | | Merge editor files, convert to new editor setup scheme, fix names according to convention. Change-Id: I2b3a72149be608df3813aaa00592c7c2facffc05 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Centralize settings connections setuphjk2014-08-201-2/+0
| | | | | | | | | | | | | | | | All editors did that manually, with varying approaches. Connect once when the document is made known to the EditorWidget instead. Change-Id: Ib0828b08158539859f6f89c8080435a027aa06ed Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Further *Editor/*EditorWidget disentanglinghjk2014-08-191-4/+4
| | | | | | | | | | | | | | | | In most cases, the *Editor constructor does not need to access the *EditorWidget. Change-Id: I1f5c076a0f723d5d82b398e8c250c7bd1d47eb17 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Merge the two sets of *EditorWidget constructorshjk2014-08-191-15/+3
| | | | | | | | | | Change-Id: I45d87d0be722ac36d64af222f03f8cb76242c9df Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | CmakeEditor: Enable code folding supportCharles Huet2014-08-121-2/+11
| | | | | | | | | | Change-Id: I00b34d09c16890de53de4cf910fa2638af3ed4d5 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | CmakeEditor: Use the generic SyntaxHighlighter.Charles Huet2014-08-121-3/+5
| | | | | | | | | | | | | | | | | | | | Removed the cmakehighlighter class, and use the TextEditor::createGenericSyntaxHighlighter with the correct mime type instead, as it provides a more robust code highlighting. Task-number: QTCREATORBUG-3272 Change-Id: I96f6fa0912441500d7aa6ab3735bcfd49d9efa57 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | TextEditor: Consolidate document access functions.hjk2014-08-041-1/+1
| | | | | | | | | | | | | | | | There was document(), textDocument() and baseTextDocument(). Two should be enough... Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | TextEditor: Make completion assist provider a data memberhjk2014-07-311-5/+1
| | | | | | | | | | | | | | | | | | In case of the CppEditor a direct member is not possible due to setup restrictions inside the CppEditor machinery. I'd expect that to be fixable when the editor base system is in good shape. Change-Id: I184e219ca2dff6f67c9b58c182212eb12972cc84 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | TextEditor: Re-work comment definition handlinghjk2014-07-311-17/+3
| | | | | | | | | | | | | | | | No need for most of the machinery. Change-Id: I9078174582d83da94c6c7f20282fd3a5f1742911 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | TextEditor: Merge BaseTextEditorDocument into BaseTextDocumenthjk2014-07-281-1/+1
| | | | | | | | | | | | | | That was the only user of that layer of abstraction. Change-Id: I2bdc4abb8b2b33bfb70398dd11f7ecc4745ddc43 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | TextEditor: Merge ITextEditor and BaseTextEditorhjk2014-07-251-1/+1
|/ | | | | | | Adjust all callers, de-export BaseTextEditorAnimator Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* CMake: Load context-sensitive help.Stephen Kelly2014-06-171-0/+42
| | | | | | | | | | | | | | CMake 3 uses reStructuredText and Sphinx for documentation. Those tools can generate Qt qch files, which makes it possible to load the documentation in QtCreator and to enable context-sensitive help when editing a cmake language file. Add a simple parser to process commands. This may be extended in the future to process variables and properties too. Change-Id: Ic5a49a9ce828ad9a9e8ff4805b48302ee73bcc71 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
* IEditor: Make duplicatesSupported a value memberhjk2014-05-211-0/+1
| | | | | Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Move id() from editor to document.Eike Ziller2014-03-051-1/+1
| | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Core: Make IEditor::id a value member and adjust usershjk2014-02-251-5/+1
| | | | | | Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditors: Set syntax highlighter only onceEike Ziller2014-01-241-1/+1
| | | | | Change-Id: Iad83e589be49aeab3f35420d071311c15ddac6b2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TextEditors: Avoid changing document after construction.Eike Ziller2014-01-101-4/+13
| | | | | | | | | | | Also when duplicating editors, we don't want to change the document after construction. Actually at some places (e.g. CppEditorSupport creation) we don't handle document changes correctly, and we are only lucky that things still (more or less?) work. Get rid of BaseTextEditorWidget::duplicateFrom and use copy-constructor style instead. Change-Id: I7f688b7fcc51d1bb5e222bb333f0d28479b597a6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Editors: Remove BaseTextEditorWidget::setBaseTextDocumentEike Ziller2014-01-101-3/+1
| | | | | | | | | First step in never changing the text document after construction, because that is actually not really supported. Second step will be to fix that for the editor duplicate() methods too. Change-Id: I3d112ba0895e7ee7ac6dd8ae2318f0de7d2cebc9 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Manifest, pro file and CMake editor can have fixed mime type setEike Ziller2014-01-091-3/+2
| | | | | | | | Can be set directly from the document constructor, no need to do that later. Change-Id: I4326757e1b1cb1e48c157c4b330ccb2abb8f3b1f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Editors: Remove some unused factory variablesEike Ziller2014-01-081-4/+3
| | | | | Change-Id: I6df843561c4d502b3d7c1844d65a59ad2855f0c0 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Editors: Remove useless parent widget argument from create/duplicateEike Ziller2014-01-081-3/+3
| | | | | | | It was never called with a sensible value anyhow, and only complicates things. Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status