summaryrefslogtreecommitdiff
path: root/src/plugins/genericprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* Make PluginManager mostly static.Eike Ziller2012-06-191-1/+1
| | | | | Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228 Reviewed-by: hjk <qthjk@ovi.com>
* Fix qbs code styleYuchen Deng2012-06-191-1/+1
| | | | | Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Generic Project: Add some missing QLatin1String's.Andre Hartmann2012-06-043-7/+7
| | | | | Change-Id: I0a3276dde7a3b8f90487c642d839611c80f53cf9 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Generic Project: Add make argument "all" when re-adding a Build Step.Andre Hartmann2012-06-041-0/+2
| | | | | | | | This makes adding a Build Step from the "Projects" configuration page consistent to the creation of a Generic Project via the Wizard. Change-Id: I6e947790fcd97795c29b4e0731ef8e2bff33767f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-3/+2
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* DebuggingHelper: Move to QtSupportTobias Hunger2012-05-185-4/+7
| | | | | | | | | * Move debugginghelper to QtSupport. ProjectExplorer should not start looking for Qt versions! * Make autotools and generic project plugins depend on QtSupport Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-05-071-1/+3
|\
| * Translate editor display names in correct context.Konstantin Tokarev2012-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | These strings were internationalized long ago, but wrong context prevented them from being actually tranlated in GUI. This patch won't break anything - if these strings were not translated for particular language, they stay untranslated, but if they were, translations are used (e.g. for RU). Change-Id: I175e29e8b0cee2bff9306623dad4a5956db69288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | GenericProjectManager: Remove todosDaniel Teske2012-05-032-3/+4
| | | | | | | | | | | | | | | | | | Actually update the "Override make" label on toolchain changes The makestep configuration widget being a friend of the step is not that bad. Change-Id: I5e88905cb0da99a4c1c28d8c56e669141e80ce17 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Compile after qt5/qtbase commit 75a0c7f9Bradley T. Hughes2012-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed some QRegExp methods to be non-const (they were previously const). This change makes Qt Creator compile again. Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Use Core::Id in project-related objectsTobias Hunger2012-04-258-72/+66
| | | | | | | | | | | | | | | | Use Core::Id for all the project related objects in favor of plain QStrings. Change-Id: I790ab40cb29899efdb49c413a77609486f52e683 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Added default implementation for IEditorFactory::open().Konstantin Tokarev2012-04-182-11/+0
| | | | | | | | | | | | | | This change allows to avoid massive code duplication along editors. Change-Id: Ifdc6ae4b44ab399d34193ab8dddfa1f76d65ad11 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-294-16/+4
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/libs/symbianutils/symbianutils.qbs src/libs/utils/utils.qbs src/libs/zeroconf/zeroconf.qbs Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
| * Generic Project: Better filtering of supported files.Francois Ferrand2012-03-294-16/+4
| | | | | | | | | | | | | | | | | | | | | | In the edit files dialog and project wizard, initial filtering of files was done by checking the file suffix in mime database. This does not work for all files (e.g. makefiles), and is not needed: filtering is done afterwards using a user-editable filter string. Change-Id: I0664aa5b3c52b663d6d94020df4e1986dd7c69a5 Reviewed-by: Thorbjørn Lindeijer Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-281-2/+6
|\ \ | |/
| * GenericProjectManager: Fix crash for make deploy stepsDaniel Teske2012-03-281-2/+6
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-7183 Change-Id: Ib917c8990c698b7315ebb79083bf71623b3ae6e7 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Remove Project::dependsOn(), it's never calledDaniel Teske2012-03-162-7/+0
| | | | | | | | | | | | | | | | I don't remember why I did leave it alone in the reafctoring some years ago, but surely it serves no purpose. Change-Id: Idf920faf3f8f7128cd410501f2c3748e100dfbfb Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-153-4/+20
|\ \ | |/ | | | | | | | | | | Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
| * Generic Project: improve filtering.Francois Ferrand2012-03-153-4/+20
| | | | | | | | | | | | | | | | | | - When applying filter, always show items which were already in project. - Store the filter string in settings. Change-Id: I5b726ed0bde49d8ac48d4f2f4589b194fc557a95 Reviewed-by: Thorbjørn Lindeijer Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Move the ModelManagerInterface out of the CPlusPlus library.Erik Verbruggen2012-03-141-1/+1
| | | | | | | | | | Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-081-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/remotelinux/startgdbserverdialog.cpp Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
| * Normalized connect()sRobert Loehning2012-03-061-2/+2
| | | | | | | | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+1
|/ | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-5/+2
| | | | | | | | | * Removed utils, extensionsystem and aggregation dependencies for plugins that depend on Core * Capitalized Find and CPlusPlus Change-Id: I505e5f46976f26da47ad778860f103b173668b1c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* ITargetFactory: Make supportedTargetIds() and canCreate() orthogonalDaniel Teske2012-02-212-4/+2
| | | | | | | | | | | | ITargetFactory::supportedTargetIds should return all targets that this factory can support, regardless of e.g. installed qt versions. Whereas canCreate() should check the availability of e.g. a qt version. This makes supportedTargetIds() have the same meaning as ITargetFactory::supportsTargetId(). Change-Id: I744abb89e441026d6f3f8de21944d780e9b9fa32 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+57
| | | | | Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-208-33/+33
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Revert "Don't accumulate includePaths and frameworkPaths on each parsing"Kai Koehne2012-02-201-3/+0
| | | | | | | | | Broke the build, and, according to erikv, 'isn't valid any more'. This reverts commit 70c77152ff5ab8471623f2733a65725b0bd0aea0 Change-Id: I7566f9f462ba58d676c1d86e0b73494fd1d97d93 Reviewed-by: Bill King <bill.king@nokia.com>
* Don't accumulate includePaths and frameworkPaths on each parsingKonstantin Tokarev2012-02-201-0/+3
| | | | | | | | GenericProject was adding includePaths and frameworkPaths to ProjectInfo on each parsing instead of updating their values. Change-Id: Id60f553909e4a9829b9001e7dd54bbb7ed7623ce Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Supply c++11 flags and per-project info to c++ code model.Erik Verbruggen2012-02-161-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A manual squash/merge of the changes below, plus a couple of subsequent code fixes. 59085aa5fbb99e2d786cd2c1a06c24a111ccb49f: Modify CppModel::ProjectInfo Adding per project node information, to pass on the correct defines/includes for each file, instead of aggregating them incorrectly. Also split up SOURCES and OBJECTIVE_SOURCES. Also ask the toolchain to convert the compilerflags to flags the codemodel understands, for now only gcc and only c++11. Also make the toolchain aware of the flags used to compile, so that it can emit the correct defines. Note: No header files are passed on. 74028802314cd4e75b41b46407433e07090a304d: GCC: Evaluate cxxflags when checking for predefined macros ebaaa4957e4c02cc9637a998eddae1d0acd74f83: MSVC: Take cxxflags into account when checking for predefined macros 9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7: Compile fixes Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5 Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-1517-58/+58
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make IFile::isReadOnly consistent.Eike Ziller2012-02-142-6/+0
| | | | | | | | | | | It is supposed to refer to the property of the file on disk (if there is any). Task-number: QTCREATORBUG-4998 Change-Id: Iaed62c17d124b364aecec4d1f910046bade42d40 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Move QtConcurrent library into Utils.Friedemann Kleint2012-02-091-1/+1
| | | | | | | | It causes a conflict with the new QtConcurrent library of Qt 5 and is quite small. Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Wizards: changes the structure of WizardsThomas Hartmann2012-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch introduces platforms as a top level topic when choosing a wizard. Also I changed the categories and priorities. Details: 1. I did change the way the dialog/view is structured in newdialog.cpp 2. I added platformName() and supportsPlatform() to BaseQtVersion. I needed two functions because the Simulator does not provide a platform and therefore has no platformName but supports two platforms. I still have to turn the platform names into proper constants. 3. I changed the categories and priorities to get the layout that was discussed. (I had to touch quite alot of files but this is mostly trivial) 4. I added a combobox that allows filtering for platforms. 5. I added flags() to IWizard to indicate that a wizard is platform independent. Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Wizards: refactoring - adding WizardDialogParametersThomas Hartmann2012-02-072-6/+4
| | | | | | | | | | | | | The Wizards itself (derived from IWizard) and the dialogs implementing the wizards were quite discoupled. Since I want to add parameters that are delivered from IWizard::run to the dialog a I added WizardDialogParameters. Examples of paramters I want to add are the choosen platform and the choosen subOption/template for this wizard. Change-Id: I9c0ae2901e3d46d3c36a3f433f4d7d508a6ba74e Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Optionaly disable buildstepsDaniel Teske2012-01-311-1/+0
| | | | | | Task-number: QTCREATORBUG-6713 Change-Id: Ief7f8509572cfa2008209083e5ae9c7763eba42a Reviewed-by: hjk <qthjk@ovi.com>
* Long live the king!hjk2012-01-2625-25/+25
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Core::Filemanager: make some methods statichjk2012-01-251-5/+4
| | | | | | | This follows suit to the ICore changes. Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-244-9/+7
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Wizards: allows filtering of wizards based on Qt versionThomas Hartmann2012-01-182-0/+6
| | | | | | | | | | | | | Every wizard now implements requiredFeatures() to define a feature set. If the feature set is not satisfied by the available Qt Versions, the wizard is not shown in the create file/project dialog. Every Qt version can define the provided feature set in availableFeatures() defined in BaseQtVersion. Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Generic Project: Show symlinked files (but not directories)Daniel Teske2012-01-131-2/+3
| | | | | | | Task-number: QTCREATORBUG-6807 Change-Id: I3d99976444c8fa2882e4218377763ae34a681c18 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Thorbjørn Lindeijer
* Generic Project: Remove dead codeDaniel Teske2012-01-132-49/+0
| | | | | Change-Id: I6557506f84d53f5e856c63eaafbbd86e1913e08b Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Add AutotoolsProjectManager pluginPatricia Santana Cruz2011-11-301-1/+1
| | | | | | | Change-Id: Icbc8d105a3ffea2bf705d18e3413f6b3487ccfd3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Readding MakeSteps to the clean step list should set them up correctlyDaniel Teske2011-11-251-1/+7
| | | | | | | | | That is set the argument to "clean" and ensure that the return value is ignored. Change-Id: I1f15ad464e6f4608d7eb698365846a4c765f1d22 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Andre Hartmann <aha_1980@gmx.de>
* compile fix with namespaceshjk2011-11-243-13/+6
| | | | | Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23 Reviewed-by: hjk <qthjk@ovi.com>
* Add a default "clean" BuildStep to Generic Projects.Andre Hartmann2011-11-244-4/+43
| | | | | | Change-Id: I9e566781d719292a6881d040385bd5ce649d398a Reviewed-by: Andre Hartmann <aha_1980@gmx.de> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* UI files: Do not polute the global Ui namespaceTobias Hunger2011-11-242-3/+9
| | | | | | | Make sure all ui-files are in the plugin's internal namespace. Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13 Reviewed-by: hjk <qthjk@ovi.com>
* projectmanager: re-organize New Project categorieshjk2011-11-181-2/+2
| | | | | Change-Id: Ie549f9843db985018af380eb6105e136f21989f7 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* genericproject: cosmeticshjk2011-11-111-7/+2
| | | | | Change-Id: I3183a76a3e74364d481ff17dc44a400255fdeb62 Reviewed-by: hjk <qthjk@ovi.com>
View Lorry Controller Status