aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/projectimporter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove spaces in initializer listsTim Jenssen2017-02-221-1/+1
| | | | | | | Format initializer lists code style like. Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Handle toolchains at the ProjectImporter levelTobias Hunger2017-02-101-1/+78
| | | | | Change-Id: I941d2eaa6fdd6135b49b51e8f685fb1d0d8b652c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Use Utils::FileName in ProjectImporter APITobias Hunger2016-11-161-4/+4
| | | | | Change-Id: I60e05f1bd892b508db90bc48837e29e2725bf333 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectImporter: Add testsTobias Hunger2016-09-261-24/+38
| | | | | Change-Id: Ia97d2c2e25af6f024fb81bedc2c121cef090105f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectImporter: Fix deletion of directory dataTobias Hunger2016-09-161-1/+3
| | | | | Change-Id: I33c4fc25ab9c85dd8433281e2915a7d9428ea40b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectImporter: Generalize handling of temporary data associated with kitsTobias Hunger2016-09-151-4/+86
| | | | | | | | Generalize handling of temporary Qt versions, etc. that is associated with temporary kits while importing projects. Change-Id: I16a0c2e7f32546e131dcbeddc7a1e5048a9ad4c8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmakeProjectImporter: Split up import methodTobias Hunger2016-09-151-4/+73
| | | | | | | | | | | | Split up the import method into several smaller methods. Call these from ProjectImporter::import, which now contains the build system independent parts, moving all the build system dependent code into the smaller methods. This will allow to reuse logic for cmake project import. Change-Id: Idcd1d1daaab18ebcc581cc5aff3f20c7757c639b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectImporter: Move logic to select preferred target into base classTobias Hunger2016-09-151-0/+28
| | | | | | | That way the code can be reused in other importers later. Change-Id: I6318f9c959b73b2af2692408b918eb1fab715137 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QtSupport: Introduce QtProjectImporterTobias Hunger2016-09-151-1/+1
| | | | | | | | | | Introduce a base class for importing Qt projects. This class handles the handling of temporary Qt versions. Use this in the QmakeProjectImporter. Change-Id: I2e540f9bb75d607a68d1277db68243b04eee168f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectImporter: Clean up APIs, move more code into Base classTobias Hunger2016-09-151-4/+23
| | | | | Change-Id: Ida7aae846888efb3c9da456a83db5a90256bf7d5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectExplorer: Use Guard in favor of setIsUpdatingTobias Hunger2016-08-291-16/+4
| | | | | Change-Id: I4f8448205fe0f90d0b8554f0911e66aa74cbe9b5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Projectexplorer: Modernize codebaseTobias Hunger2016-04-151-1/+1
| | | | | | Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.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-1/+1
|/ / | | | | | | | | Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc Reviewed-by: hjk <hjk121@nokiamail.com>
* | QmakeProjectImporter: Prepare for multiple concurrent importsDaniel Teske2014-09-031-10/+15
| | | | | | | | | | | | | | | | Fix logic around temporary qt versions. We want essentially shared ownership of kits on the temporary qt version. Change-Id: Ic8c748aa2b04afb5a30444563b3fc2f4272ca47c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Kit: Introduce variables for Kit display namesTobias Hunger2014-08-181-2/+2
|/ | | | | | | | | | | | | | | | This change also adds a AbstractMacroExpander for the QtKitInformation. It supports the following variables in the Kit display name: %{Qt:version} - Qt version number %{Qt:type} - Qt type %{Qt:name} - Qt version name %{Qt:mkspec} - mkspec used by the Qt version Task-number: QTCREATORBUG-11118 Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* 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>
* TargetSetupPage: Generalize the pageTobias Hunger2013-09-271-0/+130
Generalize the target setup page and move it into projectexplorer Move the qmake specific code into a projectimporter class with a specialization for qmake projects in the qt4projectmanager. This change depends heavily on the BuildConfigurationFactory cleanups done earlier and completes that change in such a way that generic build configuration factories are now in theory possible. The remaining problem is how to select the best factory of several that claim to be able to handle a kit and that is left for the next patch. Change-Id: I47134cb1938c52adebcdc1ddfe8dbf26abbbbeee Reviewed-by: Daniel Teske <daniel.teske@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:47:51 +0000