summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/wizards
Commit message (Collapse)AuthorAgeFilesLines
* TargetSetupPage: Improve reporting on invalid kitsTobias Hunger2020-02-061-7/+17
| | | | | | | | | | | | | Give the reason for a kit being disabled in the tooltip. E.g. for a CMake project you will now get "Kit is invalid: No CMake tool set." instead of a generic error message about the kit being invalid. Change-Id: Ic776dc24149d65ebf27163b605ec2e52a3a504a7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils/QMakeProjectManager: Remove dead codeAlessandro Portale2020-01-222-282/+0
| | | | | | | | ...otherwise I would have had to fix some theming issue. Change-Id: I70eecd8c2e4f592749f89aab0384d281ab3fdee3 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Utils: Rename FilePathList to simply FilePathshjk2019-12-181-5/+5
| | | | | | | The exact storage type does not really matter here. Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmakeProjectManager: Remove unused modules handling from wizardsChristian Stenger2019-08-145-261/+7
| | | | | | Change-Id: If943fc306c8aaf7f8dccaeb4b833988e651108e6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmakePM: QtWizard Code cosmeticshjk2019-08-132-23/+10
| | | | | | | Unused code, namespaces, foreach. Change-Id: I1a4fd2be2f4005a35b1d9ab0e38cc260ae459fda Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-1/+1
| | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer etc: More FilePath usagehjk2019-06-261-4/+2
| | | | | | | Mostly for project files. Change-Id: Icb6059f80758865e42cc9f9c092ec6782770dfd7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-282-9/+9
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-05-082-15/+25
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/howto/creator-sidebar-views.qdoc doc/src/howto/creator-ui.qdoc qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/autotest/testresultmodel.cpp src/plugins/autotest/testresultmodel.h Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
| * Fix passing of kit IDs for subproject to JSON wizardsEike Ziller2019-05-082-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | The list of preselected kits in case of sub projects was passed in a format not compatible with wizard variables (QList<Id>, but only QString and QStringList are supported). This fixes the visibility of the Kit selection page of the "Empty qmake Project" and "Auto Test Project" wizards when triggered from "Add New Subproject" from the project tree's context menu. Change-Id: Ica7305825d6323697c9b0788a9634f3d806b9d50 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Move C++ Library wizard to JSONEike Ziller2019-04-176-891/+0
| | | | | | | | | | | | | | | | | | And add build system option (QMake & CMake) Task-number: QTCREATORBUG-17308 Fixes: QTCREATORBUG-14605 Change-Id: Ibfadc4bffeabd7ec11271647460a21b6400625c7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Move Qt Widgets Application wizard to JSONEike Ziller2019-03-274-504/+0
| | | | | | | | | | | | | | | | | | Adding support for CMake as well as QMake Task-number: QTCREATORBUG-17308 Change-Id: I615b58921918ec87f935e0f11d3dd23ec20f0ac1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Orgad Shaneh2019-03-012-2/+4
|\ \ | |/ | | | | Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
| * Qt plugin wizard: Fix excess whitespaceChristian Kandeler2019-02-252-2/+4
| | | | | | | | | | | | | | | | | | Amends 075e1da67e. Fixes: QTCREATORBUG-21974 Change-Id: I4216b06ac9753e552e34575ff10f3789ff5ad8dc Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | ProjectExplorer: Rename KitInformation to KitAspectChristian Kandeler2019-02-111-4/+4
|/ | | | | | | | | | | 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>
* Polish the Qt plugin wizardChristian Kandeler2019-01-296-53/+98
| | | | | | | | | | | | | - Add overrides for pure virtual base class functions - Modernize C++ in the generated code - Do not build into the Qt installation directory by default - Rename misleading "Qt4Plugin" enum - Remove Qt 4 compatibility code - Remove some excess newlines Fixes: QTCREATORBUG-21207 Change-Id: I50641eddf9084ef3eb8199684aec639c5e5d71fc Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Wizards: Support using #pragma once instead of include guardsFilip Bucek2019-01-234-31/+41
| | | | | | | | | | | Allow users to choose #pragma once instead of #ifndef include guards in generated header files. Fixes: QTCREATORBUG-12166 Change-Id: I3ba41c7570beb9c5958e174b5581fcc25855050f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Filip Bucek <fbucek@atlas.cz>
* ProjectExplorer: Add history completion ability to SelectableFilesWidgetChristian Kandeler2019-01-221-0/+2
| | | | | | | | ... and make use of it in project contexts. Fixes: QTCREATORBUG-19781 Change-Id: I4618b6e4a64b1aaa1352afcc98e4cc6e5fac1859 Reviewed-by: hjk <hjk@qt.io>
* QmakeProjectManager: ModernizeAlessandro Portale2018-12-113-7/+4
| | | | | | | modernize-* Change-Id: Ib1d4527e223704f81f9470201735e8c2ebb2d89c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Merge remote-tracking branch 'origin/4.7'Eike Ziller2018-08-072-3/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/debugger/debuggerruncontrol.cpp Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664
| * Revert "Wizards: Drop support for Qt4 for widgets application"hjk2018-07-262-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a6522b47c7eb667d297c71a48751e22f7069c04 which leaves people wondering about their kit setups. Creating a project that possibly does not compile due to the use of C++11's nullptr in the generated code is lesser evil. Apart from that this potential mis-compilation does not happen in practice on e.g. Ubuntu 18.04 with system Qt 4 and system compiler. Change-Id: Iaa90f225d5317dc48428aa2d3fcf3ec051ef2018 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmakeProjectManager: Modernize moreAlessandro Portale2018-07-236-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | Some files (mostly headers) were missing modernization for: modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-default-member-init Change-Id: I7027efac7daa3645af21ac25c0301105945e04da Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmakeProjectManager: ModernizeAlessandro Portale2018-07-138-28/+22
|/ | | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-equals-default Change-Id: I7642992eee6838bb2566921de87390c1771ebcbe Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizard: Ensure compilable widget application templateChristian Stenger2018-06-251-0/+1
| | | | | | | | | | The used template code is nowadays C++11 specific and this is not default before Qt5.6. Explicitly enable C++11 to make the generated project compile out of the box for all Qt5 versions. Change-Id: I720126b13bfc0d3da960438df1a1106c5574053f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Wizards: Drop support for Qt4 for widgets applicationChristian Stenger2018-06-222-1/+3
| | | | | | | | | | | Generated code uses some C++11 features which cannot get easily enabled when using Qt4. Instead of adding several lines for correctly handling this on all platforms just drop the wizard support. Change-Id: If0e748283cfdddbefd3c27e3c9f4316c0ce7efe3 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Wizards: Add deployment rules to Widgets and Console applicationsKari Oikarinen2018-05-031-1/+4
| | | | | | | | | | Otherwise they can't be deployed to Boot2Qt (and other) devices. Quick application wizards already have these deployment rules. Task-number: QTCREATORBUG-20358 Change-Id: I5a19ada3f6a382e8553750769478c398a50352c9 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Kari Hormi <kari.hormi@qt.io>
* Designer: Use PluginManager getObjectByName instead of getObjectByClassNamehjk2018-04-031-1/+1
| | | | | | | | | There was only one user ever of getObjectByClassName, and has never been more than one object here. So the more common function does the trick, too. Change-Id: I9df09127d476be4ddab466f8a709a2b383a76b97 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Remove duplicated "Qt Unit Test" wizardMitch Curtis2018-03-097-743/+0
| | | | | | | | | | | | | | | | | | | | | | There are currently two types of wizards for creating auto tests: - Qt Unit Test - Auto Test Project Both produce almost identical code in the case of a Qt GUI-based test, and the descriptions are very similar. This is really confusing. The Auto Test Project wizard has support for Qt Test, Google Test and Qt Quick Test. In addition, the documentation only mentions Auto Test Projects when it discusses the creation of auto tests: http://doc.qt.io/qtcreator/creator-autotest.html#creating-tests So let's just use that and make everything simpler. Change-Id: Ia16c88c462744baa8df3f9e8082cbcad6ad9eb15 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Use project id uniformly as project contexthjk2017-12-201-1/+1
| | | | | | | | | | | | | | | | | | | The possibly intented flexibility e.g. to have different project types share the same idea of a common context was never used, in all cases we had a 1:1 relation ship between project ids and ids that were used as context. This led to oversights like the one fixed in 60fb35a2. This patch here uses the project id unconditionally as context and drops all context ids. If we'll ever have the situation where the original flexibility was needed, Project::projectContext() could be made virtual and overridden were needed. Also, the context was never modified for any given project, so the updating machinery is not needed. Change-Id: I3f7fac0ed5e4704e126558987c48577f26082dfd Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* app_version.h: Make IDE name configurableTobias Hunger2017-09-051-3/+7
| | | | | | Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: Make the big wizards icons smallerAlessandro Portale2017-07-216-0/+0
| | | | | | | | | | | | The feedback was clear: Icons were too big. This patch decreases the sizes from 92x68 to 48x48. 48x48 should not be too big anymore, and at the same time it should still allow to have an understandable image. Change-Id: I45a9f2214a43987ed60d2bd7527c025016dde745 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QMake project manager: Fix typoRobert Loehning2017-07-191-1/+1
| | | | | | | Task-number: QTCREATORBUG-18585 Change-Id: Ia9dccc1f9c19f393ad833c6ffa79ecef824981f1 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Qmake: Use member initialization for GuiAppParametersTobias Hunger2017-06-122-15/+4
| | | | | Change-Id: Ib438f41eb2e8c376fc1605046f416cd26f3503da Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update wizard template iconsMitch Curtis2017-06-068-8/+4
| | | | | | | | | | | | | | | | | | The icons have been redesigned to have a more consistent and clean look. The colors work well with both dark and light themes. The dimensions of the icons have been made larger in order to facilitate their use in an icon grid. A follow-up commit will add more wizard templates that make use of the larger icons in order to depict various Qt Quick UI layouts. Some icons (Qt Quick Application, Qt Quick Controls 2 Application) were unchanged, as the follow-up commit will remove them in favor of more specific templates. Task-number: QTPM-395 Change-Id: I5804c3fb92c60e53e1380cfb05d4c7f14e877d8a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Reduce usage of qApp in favor of static function callsAlessandro Portale2017-04-241-1/+1
| | | | | | | | | | | | Q*Application classes have unusually many static functions. In many cases in our code, these functions are unnecessarily called as instance functions, using the qApp helper. This patch replaces many occurencies of qApp with the according Q*Application classname. Change-Id: I6099a419fa7bf969891269c37ed7a9e817ef5124 Reviewed-by: hjk <hjk@qt.io>
* QMake: Prettify file lists in generated project filesAndre Hartmann2017-03-263-10/+16
| | | | | | | | | | | Having each source/header/form file on its own line makes further moving around (e.g. sorting) much easier. Also make sure there is a space between file name and trailing backslash. Change-Id: I54fccf7b6249c86034b8f41f58391ffcc63a0a27 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ProjectExplorer: Follow up on too-much-magic in IProjectManagerhjk2017-03-091-1/+1
| | | | | | | | Use a ProjectManager::registerProjectType<Project>(MimeType) function, removing cryptic IProjectManager object ownership. Change-Id: I212cd25bd4ee757022a8cb0decb4b8de3a112d12 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Utils: Wrap MimeDatabase into static functionshjk2017-03-031-3/+2
| | | | | | | | To avoid repeating the 'MimeDatabase mdb; mdb.something(); ' mantra all over the place. Change-Id: I4bfef62e73275a991455141671d6071162788e9d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectManager: Cut ties between Project and IProjectManagerhjk2017-03-011-4/+1
| | | | | | | Not needed, less code. Change-Id: Ie0d5c3a60f0392f30ed2ee9d2c5a32156b4e67e1 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Remove spaces in initializer listsTim Jenssen2017-02-227-19/+19
| | | | | | | Format initializer lists code style like. Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013 Reviewed-by: hjk <hjk@qt.io>
* KitManager: Get rid of KitMatcher classTobias Hunger2017-01-181-8/+6
| | | | | | | | Use std::function instead. Clean up API while at it. Change-Id: I6e401ab57f5375e36710c30508c596af3f4b3385 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Project wizards: warn when using deprecated APIs in new projectsGiuseppe D'Angelo2016-10-251-0/+13
| | | | | | | | | | As discussed at QtCS, almost none of our users know that they can get warnings when they use deprecated APIs, and/or disable them altogether. A first step would be getting the relevant defines added by the new project wizards. Change-Id: I5d4260b5aa094ac2a077b7b00eaa577108e5f612 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QMake project manager: add fallthrough commentGiuseppe D'Angelo2016-10-101-0/+1
| | | | | Change-Id: Icdac22ec69635675fbcd970fcc6215484bdecacd Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QMakeProjectManager: Remove BaseQmakeProjectWizardDialog::setupProject()hjk2016-10-052-8/+0
| | | | | | | This function was not used anymore. Change-Id: Ia25ac2ba098b0db18fa61c29c79ba30ac9e40725 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix buildEike Ziller2016-05-271-1/+2
| | | | | Change-Id: I0c6849957a625b38cc8d75ef1c74d6ac3fee1654 Reviewed-by: hjk <hjk@theqtcompany.com>
* QmakeProjectManager: Add a wizard to import project for editing onlyhjk2016-05-272-0/+280
| | | | | | | | | | | | | | | | | This is Heavily Inspired by the Generic project import wizard. It basically does what we commonly refer to as "Create a dummy .pro file for editing stuff in Creator". The result is generally more flexible (project logic can be added to the .pro) and better supported in Creator (.pro is first class citizen, the Generic project less so). The qmake/make build steps are currently generally enabled but are only expected to work for very simple projects like the typical "one file example for teaching purposes". Change-Id: I4976c34d423f256ea9f8f9e569c9783d90f380e3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmakePM: Use Qt5-style connectsOrgad Shaneh2016-05-265-17/+13
| | | | | | | The heavy lifting was done by clazy. Change-Id: Ibcc1bc772c6cc4413ae5834a442f7d270dc4cd75 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wholesale conversion to #pragma oncehjk2016-03-3014-56/+14
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ProjectExplorer: Fixed "New file" dialog population.Tobias Hunger2016-02-261-1/+1
| | | | | | | | Fixed a regression introduced in d5e7262e68de58b18470547b3f5bed00230c7920. Task-number: QTCREATORBUG-15696 Change-Id: I97121709f538b5abc8660c2f18bea256db2f26cc Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-1928-476/+336
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
View Lorry Controller Status