summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projectnodes.h
Commit message (Collapse)AuthorAgeFilesLines
* ProjectExplorer: Check if the project can rename a specific fileDaniel Teske2015-09-161-0/+2
| | | | | | | | | | | | | before renaming the file. This adds a new api: FolderNode::canRename(oldFileName, newFileName) that asks the project manager if a specific file renaming could be applied to the project file. Change-Id: I77bae56db06d81fd03e590285d6079abea2c514b Task-number: QTCREATORBUG-14521 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectNode: Provide default implementations of a few functionsDaniel Teske2015-09-151-7/+10
| | | | | | | Since a lot of derived classes can make use of those. Change-Id: I051542e8d318476348d753de4d4c0a30b3a9ed62 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: Avoid copy for node pathOrgad Shaneh2015-02-271-1/+1
| | | | | | | It appears to take 7% of project loading... Change-Id: I2d20d919cc861a6ee95af359a584fb27a915cf80 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* ProjectExplorer Nodes: Replace dynamic_cast with as* functionsDaniel Teske2015-02-251-0/+13
| | | | | | | | | | The OS X linker makes using dynamic_casts across shared object boundaries fail, so do all casting in the projectexplorer library and provide functions to do it. Task-number: QTCREATORBUG-13864 Change-Id: I0e13c0986f8342d83c3b838ffdd2dd7b8312b13c Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Remove setNodeTypeDaniel Teske2015-02-171-1/+0
| | | | | | | | The only two cases where it is used, the type can easily be passed to the constructor. So do that. Change-Id: I1658a377aac56b5332992c445fba39b00620a74b Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Use new mime databaseEike Ziller2015-02-171-2/+0
| | | | | Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Use FileName for Node::pathOrgad Shaneh2015-02-131-9/+11
| | | | | | 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>
* | Refactor ProjectExplorer::Node and remove NodesWatcherDaniel Teske2015-01-141-70/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea behind NodesWatcher was that it was the central place to catch node related signals, so that users didn't need to connect to each individual node and the nodes didn't need to be QObjects. Somehow Nodes ended up being QObjects anyway. Both the recently added ProjectTree and the FlatModels consume the signals the NodesWatcher sends. Unfortunately there's a ordering dependency between the ProjectTree and the FlatModels. This patch removes all NodesWatcher and instead makes the ProjectTree singleton the emitter of various project tree related signals. The ProjectTree also ensures that the ordering between the FlatModel and itself is taken into account. And it makes Node not derive from QObject, saving some memory in that process. Task-number: QTCREATORBUG-13756 Change-Id: I8b0d357863f1dc1d2d440ce8172502594138b9fb Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | NodesWatcher remove friendship to all NodesNikita Baryshnikov2014-12-151-8/+0
|/ | | | | | | Since signals in Qt5 are public Change-Id: I316105ba0d15efb5a041285f948a0843dd8322f8 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge "Merge remote-tracking branch 'origin/3.2'"Eike Ziller2014-10-141-7/+8
|\
| * 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>
* | | ProjectExplorer: Remove redundant namespace qualificationsOrgad Shaneh2014-10-141-3/+3
|/ / | | | | | | | | Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc Reviewed-by: hjk <hjk121@nokiamail.com>
* | Qbs: Do not crash when using simplified project viewTobias Hunger2014-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Root cause is trying to set the display name on a FolderNode that is not in the tree yet. Allow setting the displayname in the constructor and use that new constructor where it makes sense. Task-number: QTCREATORBUG-12897 Change-Id: I907e48cac837966e38524bfe88a87ef17d93f0b2 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectExplorer: Fix Project::displayName changesDaniel Teske2014-07-221-0/+1
|/ | | | | | | | | | The only project manager that actually sometimes changes the displayname is the cmake project manager. And that one failed to emit the right signal. And since the signal was never emitted a few places handled the signal wrongly. Change-Id: I4aa75dc3032efe49263143dbadb7585a378b9be9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectNodes: Refactor runConfigurationsFor()hjk2014-04-291-2/+1
| | | | | | | | | Rename to runConfigurations() and remove the node argument which is available as 'this'. Adjust const-ness of node argument in RunConfigurationFactory::runConfigurationsForNode Change-Id: Icb63e96a305152f90135a2656536de2581faafaf Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-181-8/+10
|\ | | | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * Fix compileDaniel Teske2014-03-181-0/+1
| | | | | | | | | | Change-Id: I4ea7d0f8c8809496c04f1bbe266eb722f999209e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTreeDaniel Teske2014-03-181-8/+9
| | | | | | | | | | | | | | | | So that the resource node can override it. Task-number: QTCREATORBUG-11678 Change-Id: Id30d1b99ee23cc18fc29fc99cf0ad7ca919ed527 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Add option to hide folder and file actions.kh12014-03-181-0/+2
|/ | | | | Change-Id: I51abb1eaae27370a714b8331bd9b2a4d36446674 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer::New File Use addNewInformation also for context menuDaniel Teske2014-03-101-1/+1
| | | | | | | So that the resourcenode can steal from it's parent Change-Id: I97a21d94c0ddb0d217c48fd69dc808446763837b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix some typosSergio Ahumada2014-03-051-1/+1
| | | | | | Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Nodes: Remove findFile and findFolder methodsTobias Hunger2014-02-271-3/+0
| | | | | | | | There may be more than one matching node, so these methods provided a false sense of reliability. Change-Id: I6471b74a1d2dd4e8afc7e836fec45355696a0741 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer: Make "Add New File" work on FolderNodesDaniel Teske2014-02-191-0/+16
| | | | | | | | The ResoureceNode will be a folder node, this enables that to work for add new file. Change-Id: Ifb4827d0900ce550be164c44979c5b72ab947c42 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer: Introduce compareSortedListsDaniel Teske2014-02-191-0/+97
| | | | | | | Which compares two sorted lists and returns a diff between them. Change-Id: I278bd43f1bd999bae6575cbf38cddbdf3ff82418 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Fix compile errorDaniel Teske2014-02-191-0/+1
| | | | | Change-Id: Iaf68a88d8563a0086766203b64d73681abd1827b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* ProjectNodes: Move (add|remove)(File|Folder)Node to FolderNodeDaniel Teske2014-02-191-6/+7
| | | | | | | | | The reason they were on ProjectNode is that the signals are emitted on the projectnode, but since I moved addFiles and others to FolderNode, this makes more sense. Change-Id: I918ca4d93dab78c8bb93dff03f53d1a6fbe21340 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectNodes: Move (add|remove|delete|rename)Files to FolderNodeDaniel Teske2014-02-191-4/+5
| | | | | Change-Id: I464a4c1da299d61accba7abf928464ea6ad2ba4c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorerPlugin: Allow hiding Open Terminal/Open containing dirDaniel Teske2014-02-191-0/+2
| | | | | | | | Those actions do only work if the project tree has some relationship with the filesystem. Which isn't always the case. Change-Id: I1db641a5a39463a37d2e4d5466a02ce9da6241ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectNodes: Move supportedActions to NodeDaniel Teske2014-02-191-23/+25
| | | | | | | | | By default this simply calls the parent's supportedActions. Most changes are due to the enum moving. Change-Id: I25bf21b712cca48450014dbb0f748ac0c461e029 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer::Node::line should be a property not a virtual functionDaniel Teske2014-02-191-3/+6
| | | | | | | | Changing it must emit the same signals as does setting path, since the sorting might change. Change-Id: Iaf29c0775387d623d2e611e202b63ab52e812140 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectNodes: Move vcsTopic to where it belongsDaniel Teske2014-02-181-1/+0
| | | | | | | | It's a nonsensical operation on anything but ProjectNodes Change-Id: Id02682e6dde99c5a08362dac0f6286282cfc15b6 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean up single namespace forward-declarationsOrgad Shaneh2014-02-121-3/+1
| | | | | | | | | | | | | | | | | | Done using the following ruby script: Dir.glob('**/*.h').each { |file| if File.file?(file) s = File.read(file) t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') } if t != s puts file File.open(file, 'w').write(t) end end } Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e Reviewed-by: hjk <hjk121@nokiamail.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
| * 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>
* | Implemented "Add Existing Directory..." feature.Pawel Faron2013-10-311-0/+3
|/ | | | | | | | | | This feature lets add files from selected directory and its subdirectories to project. Files to add are selected based on filter supplied by a user. Task-number: QTCREATORBUG-9081 Change-Id: I978e87c24c5aeffc4eb74160cd6f4f20096de017 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Rename "[Mm]ethod(s)" to "[Ff]unction(s)"Nikolai Kosjar2013-10-101-1/+1
| | | | | | | | | | | Only methods as programming functions are affected. Besides renaming some actions like "Switch Between Function Declaration/Definition" this mostly touches (api) code comments. This is a follow-up patch to commit 872bfb7. Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92 Reviewed-by: hjk <hjk121@nokiamail.com>
* Project: Simplfy file adding/removing interfaceDaniel Teske2013-07-081-15/+4
| | | | | | | | | | | | | The filetype is only relevant for Qt4 projects. But even for Qt4 projects the file type is insufficient to decide where the file should be added. So remove the file type from the interface and let the projectmanagers themselves figure out what they want to do. Also fix Task-number: QTCREATORBUG-9688 Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectNodes: Make some methods publicTobias Hunger2013-05-241-9/+9
| | | | | | | This reduces the number of hoops I have to jump through... Change-Id: I416ddb61a7ab0233d7b44619dc020caddb15aedd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* FlatModel: Fix Node::setPath() and FolderNode::setDisplayNameDaniel Teske2013-02-011-1/+6
| | | | | | | | | Both can lead to a change in ordering. This adds the necessary QAbstractItemModel signals that need to be emitted and the necessary updates to the internal data structures. Change-Id: I23824d839ddd4a615eb5bc3bdfe68ab42ed89a9e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectNodes: Add line information and act on itTobias Hunger2013-01-311-3/+7
| | | | | | | | Also allow for the path to be set. Qbs can move products from one file to the next, so that is needed there. Change-Id: Iebaf3be40fdb0e5e462d45b00cf46d58f985a163 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Allow for disabled nodes in Projects viewTobias Hunger2013-01-211-0/+13
| | | | | | | | | | Change-Id: I8b9a2666c8efdc5981adfe6a3a032884a6e50d2a Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectExplorer: Show VCS topic in treeMathias Hasselmann2012-11-161-0/+3
|/ | | | | | | Topic is usually the current branch name Change-Id: Id6ecc48744a5b3d9c7502b36b4895eb18d0ff0c6 Reviewed-by: Tobias Hunger <tobias.hunger@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>
* ProjectExplorer: Remove hack for virtual foldersDaniel Teske2012-05-081-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Previously virtual folders, that is the "Sources", "Headers" folders used a hack. This patch removes that hack, by introducing the following changes - The FlatModel and the ProjectExplorer::Nodes now don't require path() to be unique. Thus allowing the virtual folders to all return the same for path(). [1] - Introducing a new node type "VirtualFolder" which is sorted according to a priority. - Introducing a few new virtuals for displayName and toolip(), which can be overriden. [1] Note that all the project managers do require path() to be unique for some types of nodes. That also fixes: Task-number: QTCREATORBUG-7100 Change-Id: I76b730f4c4254e2894467603bbe9a30e356a0bcc Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>