aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/deployconfiguration.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Core/Utils: Migrate further to Utils::Idhjk2020-07-061-7/+7
| | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Replace ProjectConfiguration::m_macroExpanderhjk2020-02-191-8/+0
| | | | | | | | | | ... by MacroExpanders in Build and RunConfiguration. Deploy didn't use its own, BuildStep always composed an empty expander with the BuildConfiguration's, uses now the BuildConfiguration's expander directly. Change-Id: I9de51bfc32aeb3d73f4974175e42a37807e49ac1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* RemoteLinux: Let user override deployment dataChristian Kandeler2020-01-271-4/+19
| | | | | | | | | | | | That is, instead of what is specified in the project files of the respective build system, let the user manually set the data in the deploy configuration. This is intended as a last resort for use in project managers that are not able to deduce any deployment information from the project. Fixes: QTCREATORBUG-21854 Change-Id: I2fefb89a4aa846e52aeca69749ca03534f4f0a67 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Compactify DeploymentDataView implementationhjk2019-08-221-1/+1
| | | | | Change-Id: I30a4a772e9a54068566be0cab435044c073becf9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Use a plain QWidget base for deploy config widgetshjk2019-08-211-2/+2
| | | | | | | The only extra feature of a NamedWidget is not used. Change-Id: Ia85e8e8fba3a3fb60d3f28709c790efea0a30de0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Base BuildStepList on QObject, not ProjectConfigurationhjk2019-07-311-4/+5
| | | | | | | | The only shared thing is an id, and even that's arguably even better done by an enum, since there's a fixed set of three of them in that case. Change-Id: Ia9da858524a5eb44eb91512ce72105249b5a9702 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Add a ProjectConfiguration::target()hjk2019-07-291-10/+1
| | | | | | | | | ... with a suitable default implementation accessing a member populated at construction time instead of walking the parent chains on each access. Change-Id: I58dae6da80ed0b023cc603fca13a5a205b123672 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* RemoteLinux: Add "make install" step to pre-4.10 deploy configurationsChristian Kandeler2019-07-181-0/+3
| | | | | | | | ... if applicable. Fixes: QTCREATORBUG-22689 Change-Id: If3cec90bed4d84f8bf82eb0cc1d831143ee2e298 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-111-1/+1
| | | | | | | | | | | The name "KitInformation" does not properly convey the fact that it represents a certain *aspect* of a kit. The same goes for "KitConfigWidget", which in addition was inconsistent with "KitInformation". We now use "KitAspect" and "KitAspectWidget". Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Move part of deploy config initial step handlinghjk2019-01-291-4/+1
| | | | | | | | | ... to BuildStepList so it can be re-used in BuildConfiguration when attempting to set up a similar system to specify initial population of step lists. Change-Id: I2301feb2b67a80a9d9e526e4065b4d4487b7fdbd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove DeployConfigurationFactory::m_creatorhjk2019-01-251-13/+11
| | | | | | | | Behavior is uniquely determined by m_deployConfigBaseId, so a normal member functions does the trick, too. Change-Id: I04f9a5dbba6874743b56ef32cc67ad1de13169d0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Merge Qbs* into DefaultDeployConfigurationFactoryhjk2019-01-251-6/+0
| | | | | | | | | | | | | | | | DefaultDeployConfigurationFactory used extra effort to not apply to the Qbs (Desktop) case, with QbsDeployConfigurationFactory plugging exactly that hole with essentially the same functionality, which is even the default of the base class. The only differences are the display name, which is dropped in this patch, and the different keys in the .user file, which are updated with this patch. Note that the display name "Qbs Install" for the DeployConfiguration stays with this patch whereas a freshly created one will get the default "Deploy Configuration" name. Change-Id: I255371d0a0688fbc6303083eb6aa20563e876264 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove some Id use from DeployConfig interfacehjk2019-01-241-12/+2
| | | | | | | | | | | | | There's a 1:1 relation between the involved types, having either the factory or the id implies having the other. So shorten interfaces that used both so far. Also canCreate() == canHandle() && id matches, so use that directly. Also drop/QTC_ASSERT former canHandle() checks that are implicit in preceding ::find() calls. Change-Id: I686ea5774c5a01b05b3b4882b3d59080a812a677 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove registerDeployConfigurationhjk2019-01-221-1/+12
| | | | | | | | | Since the types are all the same now, no template is needed, and effectively only m_configBaseId is set, so rename the function accordingly. Change-Id: I79bbf488a0549d78b6f3f0408e6744f71a5dc190 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Make DeployConfiguration finalhjk2019-01-221-10/+0
| | | | | | | | | | There are no derived classes anymore. It turns out that the isEnabled() and disabledReason() functions are unused. Remove them. Change-Id: I0e79729e87cb68d938115e704fb8e45c24ba1013 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Allow specifying deploy config widgets in the factoryhjk2019-01-221-5/+19
| | | | | | | | Keep the generality of creating any widget, but also add a convenience function handling the single special case that was ever used. Change-Id: Iab4cbe62de04b9fcc6cb0bb305eaf9a48649d991 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Remove DeployConfiguration::initializehjk2019-01-221-5/+0
| | | | | | | | | ... and adapt remaining users. The function is now not needed anymore, all setup from the factory. Change-Id: Ibe77c3e55265309064bc8b840fd1129368cc70c1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Add a mechanism to specify initial stepshjk2019-01-211-0/+9
| | | | | | | | | | | | ... in a deploy configuration. The idea is to replace DeployConfiguration-derived::initialize() functions by that. This can also be used to cut link-time ties of "derived plugins" by using step ids instead of creation of real class instances when specifying deploy config contents. Change-Id: Id7c613b054e37fe5d03463b9b0aa7dfef44a8e13 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge DeployConfigurationFactory::{canHandle,canOffer}hjk2019-01-181-11/+1
| | | | | | | | | | | Previous uses of canOffer are effectively unchanged in behavior, other plain uses of canHandle now also check the additional requirements on the Qt version on Android (the only platform that had a custom hasBuildTarget() implementation). This is assumed to make no difference in practice. Change-Id: If12895d1421d5565ff91a18bf4d7df96c8191160 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: simplify RunSettingsWidget::aboutToShowDeployMenu()hjk2019-01-171-1/+1
| | | | | | | | Constify return type DeployConfigurationFactory::find() to avoid the use of qAsConst, and remove unncessary isEmpty() check. Change-Id: I82ddfefe4252fd9ceb798f06a66b43426d7a0723 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Simplify availableCreationIds(Target *parent) usehjk2019-01-161-5/+8
| | | | | | | | | | Similarly to before, it's either an empty list, or a single id. So use a function with bool return saying whether an id is returned and a plain accessor the the id. Change-Id: Ied2900f23bdb4c264d9fb1944c60bed734d1d8bb Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Simplify DeployConfig::displayName*hjk2019-01-161-6/+1
| | | | | | | | displayNameForBuildTarget(Id) was never overloaded, so it effectively always used the base implementation that discared the id parameter. Change-Id: Ibdba3aaf79f5b2447a20cb58c3dfdca2f34ccb6e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Simplify DeployConfigFactory::availableBuildTargetshjk2019-01-161-7/+5
| | | | | | | | | | | | | It only ever returned either an empty list, or a list with a single empty string. Using a bool return value to distiguish the cases is less convoluted. This is a leftover from the time when a DeployConfigurationFactory could potentially create more than on DeployConfiguration, but this is not supported anymore, as factories are cheap nowadays. Change-Id: I4f2a91d3509d2b978949211ee709863d5ff460c7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Make DeployConfigurationFactory more similar to RunConfigFactorieshjk2018-05-021-14/+5
| | | | | | | | | | | | | | This follows some of the recent changes to RunConfigurations: - pass Id from factory to DeployConfiguration constructors - de-object-ify DeployConfigurationFactory - use addSupportedTargetDeviceType(Id) instead of addSupportedTargetDeviceType(List<Id>) Also, use stepList()->appendStep() instead of stepList()->insertStep(pos...) with manual pos tracking in some cases. Change-Id: I09c6a9d0f66f9f85b1c13361104f7878028e1ea8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer: Report project-specific kit errors/warningsTobias Hunger2018-04-191-1/+1
| | | | | | | | | Report project-specific warnings about the kit used in Project Mode. E.g. a python project should not complain about missing toolchains, while a qmake project should. Change-Id: I5ce6742683cdeffc7ff3f1a3e8f0b89aee9aa0b4 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ProjectExplorer: Simplify DeployConfigurationFactory interfacehjk2018-03-151-45/+13
| | | | | | | | | | | Following the RunConfigurationFactory lead this replaces f = Foo::find(); f->do() by static Foo::do() stanzas. Also protect DeployConfigurationFactory::canCreate() Change-Id: I80fa491f836c3b9186f6ce6dccac4d52d4b80fc8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Remove allDeployConfigurationFactories() accessorhjk2018-01-161-5/+0
| | | | | | | | | | It's only used once to check whether there exist at least one. Since there's always the DefaultConfigurationFactory when the ProjectExplorer is present, this check will always succeed. Change-Id: Id457701bd6c8f68b91a0e225507181a878faac4a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* De-emphasize PluginManager::getObjects<Type>()hjk2017-12-151-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by additionally keeping local (currently non-owning) pools per "interesting" type. Current situation: - The global object pool does not scale well for looking up objects, as iteration plus qobject_cast typically iterates over all pooled objects. - User code that can use typed results from the object pool need to have access to the full type definition anyway, i.e. depend on the plugin of the target class anyway. The patch here solves the scaling problem is to have local type-specific pools to which objects register in their constructors and deregister in their destructors. This patch here does *not* change the ownership model of the pooled objects, however, it opens the possibility to change the ownership model per type (e.g. by not putting things into the global pool at all anymore and make the local pool 'owning') and the intent is to handle that in later patchs. Even without the follow-up patches this here is a performance improvement for the cases that access the local pools instead the global one, i.e. "practically all". Change-Id: Ib11a42df2c4ecf5e1155534730083a520dd1995b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setuphjk2017-12-081-111/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follow the rough pattern of recent *RunConfigurationFactory changes for build and deploy configurations. - Collapse the two lines of constructors similar to what 890c1906e6fb2ec did for RunConfigurations * Deploy* was purely mechanical * Build* ctors are split in connects() in the ctor body to create "empty shell for clone" etc and build step additions in initialize() functions which are only used in the create() case. -- Allows to collapse the shared 'ctor()' functions, too. - Move FooBuildConfigurationFactory::create() implementations to FooBuildConfiguration() constructor. That was a strange and unneeded ping-pong between factories and objects, and furthermore allows one level less of indirection (and for a later, left out here, some reduction of the FooBuildConfiguration interfaces that were only used to accommodate the *Factory::create() functions. - Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(), but there wasn't one in the base classses. Have one there. - Most canHandle() functions were checking simple restrictions on e.g. project or target types, specify those by setters in the constructors instead and check them in the base canHandle() - clone() is generally replaced by a creation of a "shell object" and a fromMap(source->toMap()), implemented in the base, there are two cases left for Android and Qbs that needed(?) some extra polish - generally use canHandle() in base implementation, instead of doing that in all Derived::canFoo() - as a result, canCreate/create/canClone/clone reimplementations are not needed anymore, keep the base implementation for now (could be inlined into their only users later), but de-virtualize them. - Combine Ios{Preset,DSym}BuildStepFactory. There was only one 'dsym' build step they could create. - Split the 'mangled' id into the ProjectConfiguration subtype specific constant identifier, and a QString extraId() bit. Only maintain the mangled id in saved settings. - Make ProjectConfiguration::m_id a constant member, adapt all constructors of derived classe. Not done in this patch: - Finish possible cosmetic changes on top - Add a way to specify restrictions to supported Qt versions (used in Android/Ios), as the base implementation does not depend on the qtsupport plugin - Combine the QList<X> availableFoo() + createFoo(X) function pairs to somthing like a direct QList<struct { X; std::function<X()>; }> fooCreators() to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base) pingpong - Remove the *Factories from the global object pool - Do something about priority(). Falling back to plain qmake in android+qmake setup is not helpful. Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Re-organize RunConfiguration constructorshjk2017-09-131-2/+4
| | | | | | | | | | | | | | | | | | | | The idea is to massage the setup in a way to make implementation of new configurations less error prone by identifying recurring patterns and sharing repetitive code that tends to be forgotten (see Android cloning). The former two lines of constructors (owner-and-id, owner-and-source) are split into a simple, shared, constructor and new setId() and copyFrom() functions. The change is mostly mechanical, some multiple calls to fromMap have been removed, though, some consts added. Otherwise, to keep the patch small it temporarily introduces two helper templates in IRunConfigurationFactory. Also, setId() signatures have not been unified yet. These won't be needed in the final setup. Change-Id: I8c0734496caae744a9883fe6d92c1d8f8e0234ea Reviewed-by: hjk <hjk@qt.io>
* ProjectConfiguration: Add isActive() methodTobias Hunger2017-08-021-0/+5
| | | | | | | | | | Returns true if the ProjectConfiguration element is currently active and false otherwise. Just a convenience method. Change-Id: If75809ae7e78149d264deaaf6adc4ca8a8be43c2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* ProjectConfiguration: Add project() memberTim Jenssen2017-07-311-0/+5
| | | | | | Change-Id: I0a7170c1721a9e5bcf18af1bab8158af71c64454 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Move consts that are used in a single file out of headerOrgad Shaneh2017-03-201-4/+7
| | | | | | | + inline where used only once. Change-Id: I08c60551afde1d36a2c8d5005c1ea7e52ba0515b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Remove BuildStepList::isNullhjk2016-07-211-2/+2
| | | | | | | | It's not really needed. The Null-ness is equivalent to a failed fromMap() which we execute on all usage paths anyways. Change-Id: I72bb7fb55b7f26680fa68da8eef751ca96380ecd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Projectexplorer: Modernize codebaseTobias Hunger2016-04-151-10/+8
| | | | | | Change-Id: I4793b58aa77bcd46af99f8b843c0f7439cdc9269 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
* ProjectExplorer: Sprinkle overrides over the codeTobias Hunger2016-01-291-3/+0
| | | | | | | Sprinkle overrides over code derived from classes in ProjectExplorer Change-Id: Ia4cc25649f7dc00b0ea126d8176a59afbc5ed574 Reviewed-by: hjk <hjk@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>
* Fix missing of some translationsSergey Belyashov2015-03-241-1/+1
| | | | | | | Task-number: QTCREATORBUG-13649 Change-Id: I69f78b3b8d2366003bfce81a2afba0068e716d22 Reviewed-by: hjk <hjk@theqtcompany.com> 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>
* | DeployConfigurationFactory: Properly extract the abstract classDaniel Teske2015-01-131-33/+37
|/ | | | | | | | | | | | Make DeployConfigurationFactory a true base class. Introduce the DefaultDeployConfigurationFactory as the implementation that actually creates DefaultDeployConfigurations. This mostly moves code around. The virtual canHandle method was mostly unused and was removed from most classes. Change-Id: I170d94c648e67f3fe52a76ffb5344f389ae49efc Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Set up hierarchy of ProjectConfiguration macro expanders.hjk2014-11-051-2/+14
| | | | | | | | BuildConfiguration asks Target, Deploy and Run ask either activeBuild, or Target. Change-Id: I3845cfbd16de7b85268d83b5324865ff24482152 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Provide %{buildDir} macro expansion again.hjk2014-11-051-0/+2
| | | | | | | | This was a regression introduced during the macro expander rework. Task-number: QTCREATORBUG-13260 Change-Id: I9fd28c6a522faa11992931f937dd0b0eb779f419 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.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>
* / Replace QLatin1String("x") with QLatin1Char('x') where possibleKai Koehne2014-09-041-2/+2
|/ | | | | Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232 Reviewed-by: hjk <hjk121@nokiamail.com>
* Always pass Core::Id by value.Christian Kandeler2014-07-011-5/+5
| | | | | | | | | | | 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>
* Rewrite ::getObjects usage to use predicate versionDaniel Teske2014-05-121-22/+12
| | | | | | | This makes the code easier to read and shorter. Change-Id: I6d582bd9861aa0208565301f61f098e9313b6c89 Reviewed-by: hjk <hjk121@nokiamail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 16:29:35 +0000