aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/jsonwizard
Commit message (Collapse)AuthorAgeFilesLines
* Wizards: Add the ability to remember user choicesChristian Kandeler2019-09-233-4/+157
| | | | | | | | | | | | Wizard authors can now provide a persistence key to values where that makes sense. For now, we make use of it for the build system type in all wizards and the minimum Qt version as well as the virtual keyboard settings in the QtQuick wizards. Fixes: QTCREATORBUG-16657 Change-Id: I179930665bd163b1cf198467ab8b43bc72f8ec4a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Avoid warning on empty expressionshjk2019-07-236-43/+43
| | | | | | | | 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>
* "New class" wizard: Respect the project's "no Qt keywords" settingChristian Kandeler2019-07-221-0/+17
| | | | | | Fixes: QTCREATORBUG-6812 Change-Id: I3f51c61f7a1ed1e4626be6bc31fa2e3affed2084 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.10'Tim Jenssen2019-07-042-3/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/utils/synchronousprocess.cpp src/plugins/baremetal/iarewtoolchain.cpp src/plugins/cmakeprojectmanager/cmakeproject.cpp tests/unit/unittest/CMakeLists.txt Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
| * More Utils::toSet/toListhjk2019-07-041-1/+1
| | | | | | | | | | | | | | ... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Use more toList/toSet to avoid deprecation warningshjk2019-07-031-2/+1
| | | | | | | | | | Change-Id: I43575a54ff944bf0e89d452d13944fcaee270208 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-06-281-2/+2
|\| | | | | | | | | | | | | | | Conflicts: CMakeLists.txt tests/unit/unittest/unittest.pro Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
| * Project Explorer: Fix UI textLeena Miettinen2019-06-251-2/+2
| | | | | | | | | | | | | | Use book-style capitalization for dialog and button labels. Change-Id: I2c074d83d6a95ad348daacabd561c758e0a493f8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer etc: More FilePath usagehjk2019-06-261-1/+1
| | | | | | | | | | | | | | Mostly for project files. Change-Id: Icb6059f80758865e42cc9f9c092ec6782770dfd7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-06-201-2/+7
|\| | | | | | | | | | | | | Conflicts: src/libs/utils/consoleprocess.h Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c
| * Project wizards: Fix project node assertionChristian Kandeler2019-06-191-2/+7
| | | | | | | | | | Change-Id: I864139747ee6b5e7cb1ac4d59d2b11219750ddde Reviewed-by: hjk <hjk@qt.io>
* | New class wizard: Add Qt module dependencies, if necessaryChristian Kandeler2019-06-191-0/+4
|/ | | | | | | | Provide general infrastrucure and implementation for qmake. Fixes: QTCREATORBUG-16067 Change-Id: I8c6368fe2724c9450dcbc3410b6ca459bbbdc043 Reviewed-by: hjk <hjk@qt.io>
* connect() to ambiguous signals/slots: Replace static_cast with QOverloadAlessandro Portale2019-05-281-1/+1
| | | | | Change-Id: I473d7a2a16509cee944a2a21b022a3f6f02cfd8d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-286-13/+13
| | | | | | | | 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>
* Use Qt's QFileInfoList instead of QList<QFileInfo>hjk2019-05-282-3/+3
| | | | | | | Helps to adapt to potential upstream changes in Qt 6 Change-Id: Ie154bd4fd513d46cb0493758be8943fc4581d71c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Export Wizard values to JavaScript macroEike Ziller2019-05-096-14/+104
| | | | | | | | | | | | | | | | | | Registers a new function "value('name')", available to the wizard json files, which returns the value of the variable "name" as a JavaScript object. So, variables with a string value are actual JavaScript strings, booleans are booleans, lists are lists, and dictionaries are dictionaries. The patch also makes it actually possible to assign JSON lists and dictionaries to values. This removes some hacks involving creating complex JavaScript objects through string substitution. Change-Id: I4ac6da22bc5bccc9fadee97694c2fa14d44c9307 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Wizards: Let user decide which project file to useChristian Kandeler2019-04-153-8/+119
| | | | | | | | | | | | When importing projects, it can happen that several files are encountered that could serve as the main project file. Until now, we basically opened a random one, which was less than ideal. Now the user can choose. Fixes: QTCREATORBUG-17828 Change-Id: Iec08c942d0f9ff349c9752503c8157556f07b416 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* JSON Wizards: Give labels more space even when word-wrappedEike Ziller2019-04-051-0/+1
| | | | | | | | | | QLabel has a horizontal size policy of "Preferred", but if the label is word-wrapped, the sizeHint is a using a golden ratio for width & height, but we want the label to grab as much horizontal space as it gets anyhow. Change-Id: I6ed049f4f23158014dc04f2d5020b7c2dd4c1980 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/4.8'Eike Ziller2019-01-311-2/+2
|\ | | | | | | Change-Id: Ia8fed69168d87afafdb5acf4de4d5d30f9b4ebf5
| * Fix ProjectExplorerPlugin::testJsonWizardsIconList()Christian Kandeler2019-01-241-2/+2
| | | | | | | | | | | | | | | | We returned a pointer to temporary data from a function. Amends 6796839da3. Change-Id: I920789b344c93158092ef23e4bb8019cc9c312c9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ClangFormat: Refactor indenter to allow ClangFormat unit-testsIvan Donchevskii2019-01-221-8/+11
| | | | | | | | | | | | | | | | | | | | We do not build texteditor files in unit-tests so some tricks were required to make ClangFormatIndenter available. First simple unit-test proofs it builds and runs. Change-Id: I81d5ea099bd27fd1c1ed8b5b7877299dcc62a67f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Fix warning: "Missing emit keyword on signal call"Alessandro Portale2019-01-171-2/+2
| | | | | | | | | | | | | | [-Wclazy-incorrect-emit] Change-Id: I93bdc6e23cdaccf35c9899ae16870ccc65a54f80 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.8'Eike Ziller2018-12-171-0/+1
|\| | | | | | | Change-Id: Id1484d611d457d8e4598fb53975b2288690b64bb
| * ProjectExplorer: Fix initial top level expansion of projectshjk2018-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For freshly created projects using the json wizard, this expands the outermost level of that project's entry in the project tree. This intentionally does not trigger when reloading from existing sessions do honor a user's choice after collapsing that item manually. Fixes: QTCREATORBUG-17800 Change-Id: I101efaea84e68a4e769c803918652a1447805b2b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ProjectExplorer: ModernizeAlessandro Portale2018-12-045-8/+8
|/ | | | | | | modernize-* Change-Id: I01b9b3d73a2dc2a5c858cf316a1fbff7a4113600 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* ProjectExplorer: Fix testChristian Stenger2018-10-231-3/+10
| | | | | Change-Id: Iac8e6a74543f5ad19f91dc42c0fc666890f114fc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix frequent typoRobert Loehning2018-10-231-1/+1
| | | | | | | can not -> cannot Change-Id: Ie872ada1bc9b4ed64bffb667c2e44dbb13b4ad11 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/4.7' into 4.8Eike Ziller2018-10-221-1/+2
|\ | | | | | | Change-Id: I9665e3ae097f3d472692254d7f1fee0fe5757fb5
| * Fix crash when adding file to sub folder in generic projectEike Ziller2018-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The moment the file is added to the project, a reparse is triggered, which invalidates the tree sub-nodes. So we need to check if the context node (on which the wizard was opened) still exists before trying to access it, similar to how we do that in JsonSummaryPage::findWizardContextNode. Change-Id: I9154e000a31ea8d5d4ebc66c25528d422c377b94 Fixes: QTCREATORBUG-21342 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ProjectExplorer: Fix build with Qt 5.9Nikolai Kosjar2018-10-081-1/+1
| | | | | | | | | | | | | | ‘qEnvironmentVariable’ was not declared in this scope. Change-Id: Ibd5922c07a360410e006315459b35b5c45f87a9f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Allow to define a environment variable for qtc templatesLaurent Montel2018-10-081-0/+21
| | | | | | | | | | | | | | | | | | Now we can load qtc templates from anothers directories. In kde we start to provide some templates and we need to be able to specify it. Change-Id: I373faae7fdc3fa34ac9b3c7c57d69c1a5e4d244e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Remove unused variablesRobert Loehning2018-09-071-1/+0
| | | | | | | | | | Change-Id: I8b49a2eea7509abb685d751a0f038dc3b4f555ca Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | ProjectExplorer: Modernize even moreTobias Hunger2018-07-242-3/+4
| | | | | | | | | | | | | | | | Use unique_ptr for all *Private classes, except for those in singletons. Change-Id: Ib56c31ddedc6e9cf321f15de1f1e697a27ad4089 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | ProjectExplorer: ModernizeAlessandro Portale2018-07-165-23/+22
|/ | | | | | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-default-member-init modernize-use-equals-default modernize-use-transparent-functors Change-Id: Iebed22caa2e733d292f334e956e3d16b844e14e3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Remove some lambdas from Utils::transform callsEike Ziller2018-05-282-3/+2
| | | | | | | | | | | It is often possible to user (member) functions or members directly. That improves readablility and potentially reduces the total number of symbols. Also use qobject_container_cast at places where it is appropriate. Change-Id: Ia2591bca356591e001e2c53eeebcf753e5bc3c37 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-131-2/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/settingsaccessor.cpp src/plugins/autotest/autotestplugin.cpp src/plugins/git/gitclient.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.h Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
| * ProjectExplorer: Fix warning about signed/unsigned mismatchAlessandro Portale2018-04-121-1/+1
| | | | | | | | | | | | | | | | Msvc says: warning: C4018: '>=': signed/unsigned mismatch Change-Id: Ib3fc4734088bd799271105ed3757d55562efcba3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Wizards: fix crash when index is wrongTim Jenssen2018-04-091-2/+5
| | | | | | | | | | | | Task-number: QTCREATORBUG-20193 Change-Id: I20da636a3db478c6ff0d812b1b3dc3405f73cb8e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ProjectExplorer: Avoid soft assert when creating new projectChristian Stenger2018-03-091-3/+2
| | | | | | | | | | | | | | | | Remove soft assert and do a pre-check before calling the function. Change-Id: I9882e841a47a5b7bc566f1b3a4b156df4229f051 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Implement support for project file open after AddFile actionPawel Rutka2018-02-232-2/+26
|/ | | | | Change-Id: I5f5372498a34760976cea5b7d6f5f49dd04558db Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: Add missing spacesRobert Loehning2018-02-121-16/+16
| | | | | Change-Id: If4bb6a48b1da1433c36e367c700d18a10fabe45d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Session: Move all functionality related to Nodes into ProjectTreeTobias Hunger2017-12-121-1/+2
| | | | | | | | Do no longer expose Nodes from the SessionManager's API. These are now exclusively handled by the ProjectTree. Change-Id: I585c2ac919462073870363436e767640775d9045 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* wizards: remove unused variableTim Jenssen2017-11-151-3/+0
| | | | | Change-Id: Ic6e567360b909c577ac679b6c33565021b65bf9e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: test default CheckBox valuesTim Jenssen2017-11-151-0/+5
| | | | | Change-Id: I6d1de2c5a51e52d928f397a1abe659a76f15d086 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ProjectExplorer: Fix compile for Qt <= 5.9Christian Stenger2017-11-011-7/+7
| | | | | Change-Id: I91371af7733d71cc3f3bcef3caab06a2fde4fd48 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Wizards: add IconListFieldTim Jenssen2017-10-305-112/+324
| | | | | | | | | | - reuse some code from ComboBoxField throw an abstract ListField class - ListField can handle more data like: icon, trToolTip - fix disabledIndex in ComboBoxField - adjust documentation Change-Id: I00b6ab787fb2fad97dafff32786cf73c636c772d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: add basic testsTim Jenssen2017-10-302-0/+248
| | | | | Change-Id: I647227d458540b0271070cc56106165058929d29 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: remove unused defaultsTim Jenssen2017-10-271-2/+2
| | | | | Change-Id: I001ebc7d4b18f79eec48afe08f6aaa07b1883b5b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Wizards: add a warning about unsupported keysTim Jenssen2017-10-263-57/+121
| | | | | | | | - parseData methods check that there is no unknown key is used - showing the name and type might be useful in warning and error messages Change-Id: I1371bb3af1ad48ed4b85260f3b1309cdba1cb71f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: introduce ObjectToFieldWidgetConverterTim Jenssen2017-09-292-11/+14
| | | | | | | | | | | | | | With it as a wrapper we can register any QObject to use widget based field mechanism from QWizard. It also helps to avoid the necessity for inheritance to just adjust the text property of a widget. Can not remove the TextCheckBox, because it is used in some old C++ wizards. Change-Id: I85a85a834714a4b38b501c13357fa8c8bb02b5bd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 00:32:54 +0000