summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* Changed URL to qt-project.org in pluginspecs.Konstantin Tokarev2012-07-301-2/+2
| | | | | | | Also, it's 2012 now. Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* tr()-Fixes for 2.6.Friedemann Kleint2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | - ProjectExplorer::Profile should appear as 'Target' in the UI. - Fix messagebox title capitalization - Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class names, add where applicable to replace QCoreApplication::translate(). - Introduce message utility function for the commonly used 'No tool chain set up for this profile' message to ToolChainProfileInformation. - Introduce message utility functions related to adding files to version control to VcsManager to be shared by QmlJsEditor. - Fix typos. - Remove QObject::tr(), QCoreApplication::tr(). - Do not translate diagnostic console warnings of QmlProfiler. Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Changed return type of :ICore::mainWindow() to QWidget*Konstantin Tokarev2012-07-191-1/+0
| | | | | | | | Also removed all <QMainWindow> includes which are not needed anymore. Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4 Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-1927-79/+25
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compileDaniel Teske2012-07-182-4/+3
| | | | | Change-Id: I1f9afb9f802d8eae4d95e8505328d1dccafdc98a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* CMakeProjectManger: static_cast instead of qobject_castDaniel Teske2012-07-181-3/+1
| | | | | | | It's a CMakeProject, it must be a CMakeBuildConfiguration Change-Id: Ibd0907112661a89f7ca84ffdf62a1dbcbd436ed8 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* CMakeBuildConfiguration: Less qobject_casts more static_castsDaniel Teske2012-07-182-8/+5
| | | | | | | CMakeBuildConfigurations can only exist on CMakeProjects Change-Id: I8501e39f133fea854b953f9739e001cae1f2c0ea Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* CMakeRunConfiguration: Check once with object_cast for CMakeProjectDaniel Teske2012-07-181-1/+1
| | | | | | | And then use that knowledge to simply do a static_cast Change-Id: Ia145468235ed0b75ed243d6ae2d76ab824df2958 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Remove CMakeRunConfiguration::activeBuildConfiguration()Daniel Teske2012-07-182-7/+0
| | | | | | | It's the same as RunConfiguration::activeBuildConfiguration Change-Id: I117edbe2347dd40b183ba7e9d2f6ace08645db7e Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix cmake to parse Qt build application outputTobias Hunger2012-06-291-2/+13
| | | | | | | Task-number: QTCREATORBUG-2450 Change-Id: I7e041aece19b863b59fe2b2164b126cf414f82a9 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Fix crash in cmake pluginTobias Hunger2012-06-211-0/+2
| | | | | Change-Id: I90fa6386e98c7b089c5b1192f3657629a1da2112 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Profile introductionTobias Hunger2012-06-2117-627/+232
| | | | | | | | | | | | | Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* 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>
* Add ActionContainer::addSeparator(...)Eike Ziller2012-06-052-7/+1
| | | | | | | Gets rid of a lot of code duplication. Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72 Reviewed-by: hjk <qthjk@ovi.com>
* CMake: Read macro definitionsPeter Kuemmel2012-06-042-3/+40
| | | | | | | | | | The CodeBlocks generator writes for each macro definition <Add option=-D... /> (also make getters const) Task-number: QTCREATORBUG-3922 Change-Id: I93e10397e76ad4f34126a76c4c36e4529d48d0ad Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* ActionManager API cleanup.Eike Ziller2012-05-253-14/+12
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* IOptionsPage: replace virtual fuctions by data membershjk2012-05-232-35/+14
| | | | | Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* DebuggingHelper: Move to QtSupportTobias Hunger2012-05-185-12/+14
| | | | | | | | | * 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-161-0/+2
|\
| * CMake: Fix crash in makestep if used in the deploystep listDaniel Teske2012-05-151-0/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-7427 Change-Id: I8cc1e49e87d38c1a789bf3dee25b62668efc433d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | ProjectExplorer: Remove hack for virtual foldersDaniel Teske2012-05-081-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Separate destructive clean/rebuild actions from rest.Eike Ziller2012-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | Also clean up the use of icons to be more consistent. In the project context menu show the name of the project the actions apply to only once in "Set '%1' as Active Project" (and in the "Close Project '%1'") to avoid repetition. Change-Id: I7f2d7bc9e3ed60c915e0a2badfbdab5f854e9b6f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | CMakeProjectManager: Remove outdated todosDaniel Teske2012-05-035-22/+4
| | | | | | | | | | | | | | | | Most of them are done, or are not really todos but just notes on the code. Change-Id: Idc4836844ee7bc1444e1251f97118bd9103a6019 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | texteditor: use an enum instead of QString as color idshjk2012-05-031-6/+6
| | | | | | | | | | Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Use Core::Id in project-related objectsTobias Hunger2012-04-2510-77/+78
| | | | | | | | | | | | | | | | 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-7/+0
| | | | | | | | | | | | | | This change allows to avoid massive code duplication along editors. Change-Id: Ifdc6ae4b44ab399d34193ab8dddfa1f76d65ad11 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | qtcassert: move actual printing to separate function and enforce stylehjk2012-04-171-1/+1
| | | | | | | | | | | | | | This also allows simple setting of breakpoints on failed asserts. Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | CMake: Fix warning about unused variableKai Koehne2012-04-111-2/+1
| | | | | | | | | | | | | | ICore::actionManager() is a static function. Change-Id: Ic687dd1e41923e962f8eaf12b513dc188655d9c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
* | RunConfig: Rename signal isEnabledChanged(bool)Tobias Hunger2012-03-291-1/+1
| | | | | | | | | | | | | | | | Rename signal isEnabledChanged(bool) to enabledChanged() as that is also used by the BuildConfigurations. Change-Id: I9fc8906a2abbf9d19e21129309bee6ff5a142117 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-281-2/+4
|\ \ | |/
| * CMakeProjectManager: Fix crash for makesteps in deployconfigurationsDaniel Teske2012-03-281-2/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-7143 Change-Id: I0bf4e0e45367c361bd3efa5e2db9349d438184ab Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Added TextEditor commands FollowSymbol and JumpToFile.Konstantin Tokarev2012-03-285-25/+3
| | | | | | | | | | | | | | | | | | | | Most of editors have "jump to file" or "follow symbol" actions. This patch reduces amount of related boilerplate code. New actions are made optional to prevent shortcut clash (both use F2). Change-Id: I2af580ed9d6789df25f4487ba001f3b83887c504 Reviewed-by: hjk <qthjk@ovi.com>
* | Forward declare QFileSystemWatcherKonstantin Tokarev2012-03-262-1/+5
| | | | | | | | | | Change-Id: I9ddfe95ea9e0df31c6737e11fe7b4b095b594d18 Reviewed-by: Daniel Teske <daniel.teske@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>
* | Move the ModelManagerInterface out of the CPlusPlus library.Erik Verbruggen2012-03-143-3/+3
| | | | | | | | | | Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-082-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/remotelinux/startgdbserverdialog.cpp Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
| * Normalized connect()sRobert Loehning2012-03-062-3/+3
| | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-021-2/+2
|\ \ | |/
| * Added tr() for 2 messages in cmake pluginSergey Belyashov2012-02-291-2/+2
| | | | | | | | | | | | | | Messages: "Build directory:" and "Run cmake" Change-Id: Id9306d595cf9d539fd7acd22f0759e3726a4c376 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Removed unneeded includeKonstantin Tokarev2012-03-011-1/+0
| | | | | | | | | | Change-Id: I776780ec781c4325387b39c7c4f34811921d8468 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Added special context menu for CMakeEditor.Konstantin Tokarev2012-03-016-11/+182
|/ | | | | | | | | This patch replaces generic context menu in CMakeEditor with CMake-specific menu, containing action for file navigation and line commenting. Change-Id: I30c4ab5e517c77f801d2cc27561ded79dcf977a3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-4/+1
| | | | | | | | | * 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>
* projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"hjk2012-02-212-40/+0
| | | | | | | | | | | | This is the first step of a larger refactoring. The plan is to make debuggersettings more orthogonal to individual runconfiguration implementation. This patch alone already pushes the settings handling to the debugger plugin and removes code duplication in the runconfiguration implementation. Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+61
| | | | | Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-206-19/+19
| | | | | | | | 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>
* 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>
View Lorry Controller Status