summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/kit.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | ProjectExplorer: Introduce IDeviceFactory::iconForId()Alessandro Portale2016-11-301-5/+20
|/ | | | | | | | | | | This adds the possibility to have an icon for a device type. Now, a Kit can have a proper icon if just the device type but not device is selected. Change-Id: I2a382ffd5b46cbbf74cdd0b934b3d450d300bfff Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ProjectExplorer: default icons for IDeviceAlessandro Portale2016-09-261-23/+24
| | | | | | | | | | | | | | Enable devices to define their default themable icon. Kit icons are now by default the Desktopdevice icon, overridable by the device icon of the kit's device, in turn overridable by an icon file path. KitManagerConfigWidget: The browse button for the Kit icon gets a "reset" action. Change-Id: I6328ba7d640393aee2c324c592e76b4d5430586a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Kit: Add a method to retrieve all existing keysTobias Hunger2016-09-211-0/+5
| | | | | Change-Id: I819fa19e2b4b2a96c3ea8f556ba0ce9116e5f3dc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Kit: Do not allow kitinformation to spam the kit's tooltipTobias Hunger2016-09-191-2/+11
| | | | | Change-Id: I9fbd4072625567f110f29bc7e65a68e14c4bc6b2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Projectexplorer: Modernize codebaseTobias Hunger2016-04-151-17/+10
| | | | | | Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
* ProjectExplorer: Flat desktop device icon for flat themesAlessandro Portale2016-03-231-3/+9
| | | | | | | | | | This change flattens the desktop device icon in the mode bar. Only for themes which set the FlatSideBarIcons flag. ":///DESKTOP///" deduplicates to Constants::DESKTOP_DEVICE_ICON Change-Id: Ie31d9c501db2a1e36edbfac59abdd22a4d8c6773 Reviewed-by: Eike Ziller <eike.ziller@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>
* Qt: Remove platformName and platformDisplayName methodsTobias Hunger2015-12-021-20/+9
| | | | | | | Fix fallout of this in KitInformation/Kit/KitManager and the wizards. Change-Id: I5cb88cc381dc04409401909b810940ab6dccf86a Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Wizards: Turn "platform" into an IdTobias Hunger2015-12-021-5/+5
| | | | | | | It used to be a string constant. Change-Id: Ibea34dc52e97a483989e6d628b908231f4e2dc54 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* FeatureProvider: Remove Feature and FeatureSetTobias Hunger2015-12-021-3/+3
| | | | | | | | Use Core::Id for Feature and QSet<Core::Id> for FeatureSet. Change-Id: I12341036bd9eaa82589d92bd3f7d21f2e6b737bd Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Do not create a QFileInfo via Utils::FileName::toString()Tobias Hunger2015-11-031-1/+1
| | | | | | | Use Utils::FileName::toFileInfo() instead. Change-Id: I63615b0e4ce1dd2e32d5f2b488710a55b8507d34 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Kit: Remove some unused codeTobias Hunger2015-08-271-26/+0
| | | | | Change-Id: I7f929466f9a4284127a301db3f38320934bcff20 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Kit: ignore invalid idsNikita Baryshnikov2015-04-301-4/+9
| | | | | Change-Id: I4947b4188fdddaa63670891fb8988324ff6686fd Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.3'Eike Ziller2015-02-121-0/+6
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/watchhandler.cpp src/plugins/projectexplorer/kitmodel.cpp src/plugins/qbsprojectmanager/qbsprojectmanager.cpp src/shared/qbs Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
| * Kit: Fix crash on removing android kits that were autodetectedDaniel Teske2015-01-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To reproduce: In the Android settings, enabled "Automatically create kits" -> This creates kits with autodetected set to true Switch to the kits page to get the KitPage filled, those kits now appear under the autodetected node. Switch to the Android settings and disable "Automatically create kits", -> This doesn't want to delete the old kits, to not throw away user settings, so the kits are marked as manual by calling setAutoDetected Switch to the Kit page and notice the kits still listed under the autodetected node. Clicking apply enables the remove button and on removing Creator crashes. Add the necessary signal emissions to setAutoDetected and several other methods and fix the KitModel to cope with changes to autodetected. Task-number: QTCREATORBUG-13736 Change-Id: I3d0ff247a6bfff8ace53df8535749db5c736d54b Reviewed-by: Tobias Hunger <tobias.hunger@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>
* | ProjectExplorer: Remove unneeded qualificationsOrgad Shaneh2015-02-061-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I1d05d48b23f44e3d589cc2a790803714786b57d2 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* | String improvementsRobert Loehning2015-01-061-1/+1
|/ | | | | Change-Id: I45778c9562ba530a36ddaf201f0c61d380d701cf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Provide a facility to hide macros in the chooserhjk2014-11-051-3/+6
| | | | | | | ... and use it for the Current* fallbacks in the Kit expander. Change-Id: I1d346aa56647f6d3030bd4384eb89e2a27db6418 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use fileSystemFriendlyName() accessor instead of memberhjk2014-10-271-2/+2
| | | | | | | There's some extra logic in the accessor. Change-Id: I0d7b9a9bd2439ef7f1186662b34db85522ffa252 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Replace some genitive of lifeless thingshjk2014-10-271-3/+3
| | | | | | | Despite the trend to use it for geographic names and organizations... Change-Id: If135e78d1777f3f7d6c1688e9007969082bf3545 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Expand CurrentKit:* also in local kit expandershjk2014-10-271-0/+13
| | | | | | | | | | This provides the same global fall back as the global expander without relying on the currentKit() discovery process there. Change-Id: I6f62e58c086ad45fa76acfdf5e0a273ff3fa86e9 Task-number: QTCREATORBUG-13231 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Dissolve KitMacroExpander classhjk2014-10-231-20/+6
| | | | | | | | It's a normal MacroExpander by now, with some extra setup code that's used only in one place. Change-Id: I97244b93d5c165245b02748508c7fdef1b191582 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Capitalize macro nameshjk2014-10-221-2/+2
| | | | | Change-Id: I6492d625ede6c4425e5dd4b6f19a327f1931f64c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add Kit ID to macro expansionshjk2014-10-221-1/+8
| | | | | Change-Id: Ib44c93c6708ac651f1140c2654d89344a1b12b2c Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Make expanders work with subexpandershjk2014-10-211-12/+7
| | | | | Change-Id: I30bad85ce2fbaf1f02043b3d97f657461f5a1995 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* MacroExpander: Fall back to global expanderhjk2014-10-161-1/+1
| | | | | | | ... and use that all over the place. Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* MacroExpander: Allow registering local expansionshjk2014-10-151-34/+16
| | | | | | | | | | | This allows a MacroExpander also to describe an expansion it can do which was restricted to the global VariableManager only. The global is now just a thin (unneeded) wrapper about new "standard" functionality. Change-Id: Ida7ca70cf3d319eae4220ea8d12f3dd1c0d4042c Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Kit: Rename m_displayName to m_unexpandedDisplayNamehjk2014-10-141-13/+13
| | | | | | | That's what it is. Change-Id: Ibd19203b30a98eb2b4b57039a8d619c031d2e5e2 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.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>
* | Kit: Denoise kit.cpphjk2014-10-101-24/+21
| | | | | | | | | | | | | | Mostly namespaces. Change-Id: Ib11a75207d20e4db1233542e7e021dab647d70a6 Reviewed-by: hjk <hjk121@nokiamail.com>
* | projectexplorer: avoid excessive kit updatesFawzi Mohamed2014-09-101-3/+3
| | | | | | | | | | | | | | | | unblock did always assume something changed (and mustNotify not correctly set) Change-Id: Id2133b55ef27110a41be22d1f769fd987aa11033 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Kit: Change displayName generationTobias Hunger2014-09-041-47/+10
| | | | | | | | | | | | | | | | | | | | Do not care whether the unexpandedDisplay name is unique or not, nor whether the display name is unique or not. Warn if it is not in the Kits Options Page, but that is all. Change-Id: I1cbeb5beb477d533092ade6ef67a97044e53477c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | QmakeProjectImporter: Prepare for multiple concurrent importsDaniel Teske2014-09-031-0/+19
| | | | | | | | | | | | | | | | 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-11/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | FeatureProvider: Move features into KitsTobias Hunger2014-07-301-0/+39
|/ | | | | | | | | | | | | | | | Make available features and platforms methods on kits (implemented via the KitInformation). Add convenience methods to KitManager to collect all that. Remove QtFeatureProvider and implement KitFeatureProvider instead. The idea of this patch is to make it easier to find which kits are applicable to which wizard: I should now be able to match the wizard features against a kit and have a good set of kits to choose from. Change-Id: Ie5be0213f142cfdf4417ac55bd6cbb056265a531 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Always pass Core::Id by value.Christian Kandeler2014-07-011-2/+2
| | | | | | | | | | | Currently we pass in some places by value, elsewhere by const ref and for some weird reason also by const value in a lot of places. The latter is particularly annoying, as it is also used in interfaces and therefore forces all implementors to do the same, since leaving the "const" off is causing compiler warnings with MSVC. Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803 Reviewed-by: hjk <hjk121@nokiamail.com>
* Reinvent deprecated qSort as Utils::sortNikita Baryshnikov2014-06-191-1/+2
| | | | | | | Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Make a kit's file system friendly name configureable.Friedemann Kleint2014-04-281-1/+21
| | | | | | | | | | | This makes it possible to use concise names for shadow-build directories, for example {projectname}_5s for Qt 5 / stable instead of the long, auto-generated names. Also, users can then manually configure names for kits with non-latin names, which would otherwise result in underscores and dashes with numbers. Change-Id: If0eab746942246d1aba6a5dd04f59d3219be47b8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kit: Save sticky kit informationEl Mehdi Fekari2014-03-181-0/+10
| | | | | | | Task-number: QTCREATORBUG-10485 Change-Id: I02081a45ce789992f22f79dc0fc3a60fe7ce439f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* FileUtils: Add static method to construct FileNames from Latin1Tobias Hunger2014-02-111-2/+2
| | | | | Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Make sure to generate qmake friendly file namesTobias Hunger2014-02-061-3/+3
| | | | | | | | | | According to Ossi the only safe characters in a path for qmake are alphanumerical, underscore, dot and dash. Task-number: QTCREATORBUG-10980 Change-Id: Ibacbfeb7f04f1f0524093f1d8fce637ea4ae6fd6 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@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
| * 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>
* | Avoid value-list creation when iterating over maps.Friedemann Kleint2013-12-161-1/+1
| | | | | | | | | | Change-Id: I704ba93d01ffababb405bc801f07a845631930cc Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Kit: Add AutoDetectionSource to KitsEl Mehdi Fekari2013-12-121-0/+16
|/ | | | | | | | This allows plugins (e.g Andoird, BlackBerry...) to better control the kits that are auto generated from their SDK/Target sources. Change-Id: I250451a21364780d083ef99af232ae914f8756f4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kit: Add constructor to restore Kit from QVariantMapTobias Hunger2013-10-171-35/+34
| | | | | | | | | | | | | | Do not trust kits with an invalid id, as there is no way those could have ended up being saved out by creator. Safe all other kits that were constructed using Kit(const QVariantMap &). This new constructor uses the code that used to be in fromMap(...), with some simplifications. Remove fromMap(...) method from kit as it is no longer used. Change-Id: Iac28ea9b85670e03088a4b7c5283af6b4b70c0fc Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Kits: Delay validationTobias Hunger2013-10-161-7/+19
| | | | | | | | | | This avoids useless validation runs during construction. Also reorder member variables to save a couple of bytes in the structure. Change-Id: Ibc33b89f12c306852af02d387ee2d177f732bb83 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
View Lorry Controller Status