aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/templates
Commit message (Collapse)AuthorAgeFilesLines
* Corrects the project type supportedMariana Meireles2019-10-101-1/+1
| | | | | | Change-Id: I9434ed86d4d20e44abbe2cd07f9a7d838a53761a Reviewed-by: hjk <hjk@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Wizards: Fix JSON file template for Qt Creator pluginChristian Kandeler2019-09-251-8/+8
| | | | | | | | | | As of commit aaa8beab88, template files for XML wizards go through Utils::TemplateEngine::processText and thus need to have their backlashes escaped. Fixes: QTCREATORBUG-22945 Change-Id: I33aaa73b66be065f0ba3ed9b45cb8c9558f70d31 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Add qbs support to library wizardChristian Kandeler2019-07-182-3/+73
| | | | | Change-Id: Id78bc547cf42dec8948d7ebca56eacfcbbd2f055 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix capitalization of "qmake"Robert Loehning2019-07-181-1/+1
| | | | | | | | Shall be consistent with other wizards Change-Id: I810cf55abf519f5b67155063ce515c4442fc6637 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix imports in Qt Quick wizardsEike Ziller2019-07-162-10/+10
| | | | | | | | Fix-up of e0d38ae4140d6101b483fde25158fc94b34a3a64 Change-Id: I9f4055647bbf82c89b3282048944bc6ac89faacf Fixes: QTCREATORBUG-22614 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Application wizards: Remove duplicate entry in a generated .qrc fileAlessandro Portale2019-07-151-1/+0
| | | | | | | qml.qrc: Warning: potential duplicate alias detected: 'main.qml' Change-Id: I949fda863175c3de4a828a93ca01620010a44e93 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Wizards: Fix typo in Plain C++ wizardChristian Stenger2019-07-041-1/+1
| | | | | Change-Id: Ifbef31b7edded3f372debe3065fe4e9abc4e9455 Reviewed-by: David Schulz <david.schulz@qt.io>
* Wizards: Fix qbs project template for QtQuick appChristian Kandeler2019-06-271-1/+1
| | | | | Change-Id: Iffc9dad352d78f54557f45b36687c543935853dd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Wizards: Fix regular expressionsChristian Stenger2019-06-275-7/+7
| | | | | | | | | | | | | | | | Although this is valid JavaScript matching the '.' is not working as expected. The directory always gets messed up by replacing the first character with a dash. Use an alternate regular expression and also ensure the replacement happens globally instead of once as we want to replace all dots by a dash. As at it fix handling of the file suffixes as well. Task-number: QTCREATORBUG-22625 Change-Id: Ide189fe50e29994abfb368e503050b9b413aba9f Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Small clean-up of CMake WizardsCristian Adam2019-06-127-62/+89
| | | | | | | | | | * Updated CMake minimum version to 3.5 (Ubuntu LTS 16.04) * Lowercase commands * Used the target name instead of ${PROJECT_NAME}, which nobody uses in practice * No string quotes around the source filenames, which do not contain spaces Change-Id: Ide9b3eb85535213798c6c35e08624cae080ebd9d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wizards: Include namespace in header guards againChristian Kandeler2019-06-123-3/+3
| | | | | | | | This was broken in 63c339ffba while trying to fix a different bug. Fixes: QTCREATORBUG-18157 Change-Id: Iec7e14de257195ed9bb20314b8031d3ef59df2ae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Wizards: Fix CppLibrary wizardsChristian Stenger2019-06-032-3/+3
| | | | | | | | | | Fix wrong string evaluation of boolean values which made in turn the generated files partially wrong. Introduced with cb63706f83610 (but wrong also before for the no-Qt-dependency case). Change-Id: I404534d4b21d0d1c496635adfcd8a73716ba13d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix C++ Library wizard when compiled with Qt < 5.12Eike Ziller2019-06-032-2/+2
| | | | | | | | | | | | Only Qt 5.12 got true ECMA Script capabilities, so arrow function expressions are not supported before that. To be able to use "regular" inline functions, we allow usage of } by escaping with backslash. For variables that do not start with "JS:" we already supported backslash for escaping. Fixes: QTCREATORBUG-22336 Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Wizard: Make the default generated template runnableChristian Stenger2019-05-271-0/+10
| | | | | | | | | | If one uses the Python - Window template and does not explicitly change the custom base class to an existing the generated project lacks some essential stuff. Make the generated main file usable even for first time users. Change-Id: I898189fd4edff88f13987d6d1df9f77e2ef6bd68 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Wizard: Fix AutoTest wizard for Boost with CMakeChristian Stenger2019-05-241-5/+7
| | | | | | | | While at it use the same environment variable used for Qmake or Qbs based project. Change-Id: Ieefb4e1da4ce4155863b80a1b275b67e664273c6 Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Further adaption following official termsChristian Stenger2019-05-242-9/+2
| | | | | | | | | | | GoogleTest started using the term Test Suite for grouping related tests and Test Case for general tests. This patch adapts the visual strings as well as some internal API which used the same terms. This completes 6189745a3b8d3a24627193f9ad8fb18fa84099ed. Change-Id: I0307c10b8b5f8574f31a68ee4320732f3e829532 Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Add wizard for Boost testChristian Stenger2019-05-235-2/+98
| | | | | | Task-number: QTCREATORBUG-21169 Change-Id: I77936e3e47911cf724705c858b9897c74875c41e Reviewed-by: David Schulz <david.schulz@qt.io>
* Wizards: Take Qt virtual keyboard setting into accountChristian Kandeler2019-05-212-0/+9
| | | | | | | | ... in the project files. Fixes: QTCREATORBUG-22446 Change-Id: I39f8d6be17ac9fb8f41dd91851578e34c249bfe3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-05-171-1/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp Change-Id: I473084232ab99c18e2316154656de0035af02628
| * Fix error message when adding empty qmake project as subprojectChristian Kandeler2019-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON wizard code expects that at least one file gets opened either as a project or in an editor. This was not true when adding an empty qmake project, because its .pro file loses the "open as project" property when added as a sub-project, and there are no other files to open. We fix this by also setting "open in editor" for the .pro file, which makes sense (also for the top-level case), because a user is likely to add custom content there right away. Change-Id: Icdf68bccb2488bdb26b6b3c8410da901a4eb32df Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | JSON wizard: Fix invalid json filesChristian Gagneraud2019-05-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | share/qtcreator/templates/wizards/projects/vcs/git/wizard.json: Invalid \escape: line 16 column 59 (char 574) Loading share/qtcreator/templates/wizards/files/java/wizard.json: Invalid \escape: line 12 column 137 (char 466) Change-Id: I2aeed7d5e167b92a1d118678d112f4a568c59997 Fixes: QTCREATORBUG-22432 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Export Wizard values to JavaScript macro (Fixes)Christian Gagneraud2019-05-1011-14/+14
| | | | | | | | | | | | | | This fixes a few misses from e0d38ae4140d6101b483fde25158fc94b34a3a64 Change-Id: Ibd0253ca4045afe3745cafeca2f57b083e141bd3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Wizards: Fix java file wizardChristian Stenger2019-05-101-1/+1
| | | | | | | | | | | | | | | | Avoid ending up with a wrong named class when specifying the file name instead of the class name. Change-Id: I5e2ddaae1a16d60aa40fb9303e8d49efa9f51b7e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Export Wizard values to JavaScript macroEike Ziller2019-05-0938-563/+612
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-05-081-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * Wizards: Fix Quick UI wizard by adding a kit selection pageChristian Stenger2019-04-291-0/+10
| | | | | | | | | | | | | | | | Avoids configuring the Quick UI template always with the default kit even if it does not match the minimum requirements. Change-Id: I2a0d83346e53c2388c8c2ba41e9409fcb52beea8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Wizards: Allow non-existing base directory for new filesChristian Kandeler2019-05-086-6/+6
| | | | | | | | | | | | | | | | It's a valid use case to put new files into a new directory. Task-number: QTCREATORBUG-15599 Change-Id: Iea479d7a723302a14ba8cc887c1036ea6a120ced Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Qt Creator Plugin Wizard: Use 'override' in generated codeAlessandro Portale2019-05-081-4/+4
| | | | | | | | | | | | | | | | ...otherwise Qt Creator immediately underlines the code it previously generated. Change-Id: Id2355c3a1bd070a5bc40b9d02cb2dabe730d9790 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QtQuick2 extension wizard: 'explicit' and 'override' in generated codeAlessandro Portale2019-05-081-2/+2
| | | | | | | | | | | | | | | | ...otherwise Qt Creator immediately underlines the code it previously generated. Change-Id: Ia751f405f918c5736469fb245099af135374edb5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Fix typo in wizard.jsonChristian Gagneraud2019-05-071-1/+1
| | | | | | | | | | Change-Id: Ie7a51f5bd65a8d82b32dc95dfbcf89ea09c45227 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Make QtWidgets wizard work with namespaced QtChristian Kandeler2019-04-301-0/+6
| | | | | | | | | | | | Fixes: QTCREATORBUG-19590 Change-Id: Ic003b2b1f580d9a6708e144b690c4cee8d94ff69 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Wizards: Fix include statementsChristian Kandeler2019-04-306-6/+6
| | | | | | | | | | | | | | | | | | The header file must be referenced relative to the location of the source file. Task-number: QTCREATORBUG-15599 Change-Id: Ib7d4aa5a62a94541cbe32cd340a8a1e7d6ef35e5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Update QBS templateBogDan Vatra2019-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | Use Application instead of CppApplication as it's more suitable for Android Apps. Bump default C++ standard Change-Id: I57cfafe24da42aeab5c46cb993cc371d6e71f0b7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | C++: Do not apply "Lower-case file names" setting to file wizardsChristian Kandeler2019-04-258-8/+8
| | | | | | | | | | | | | | | | | | This setting is intended to derive file names from class names. It is not relevant if the user explicitly provides a file name. Fixes: QTCREATORBUG-14711 Change-Id: Ic31f8727220d99692286adf9ad0434ce06aa7c62 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | JSON C++ Library wizard: Avoid some empty lines in outputAlessandro Portale2019-04-172-3/+1
| | | | | | | | | | Change-Id: I251299a2faf8580d199d6b0c0688904f59f13311 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Move C++ Library wizard to JSONEike Ziller2019-04-179-0/+459
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-04-121-3/+3
|\| | | | | | | Change-Id: I95c56cc9371959f96afde3677fc82481f36f66c8
| * AutoTest: Fix wizard for qbs and cmakeChristian Stenger2019-04-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | If a kit had no Qt configured the wizard for creating GTest projects did not work even for build systems that did not need Qt (Qbs/CMake). Json wizard needs some adaption before fixing this properly, so work around this issue by specifying a common existing "feature". Limiting the wizard for that case to desktop devices does no big harm as the AutoTest plugin is currently limited to desktop anyhow. Fixes: QTCREATORBUG-22264 Change-Id: I7a26f3cbc44762f7eda356128f6c25ca5cee6707 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add Qbs support for the QtWidgets application wizardChristian Kandeler2019-04-082-3/+44
| | | | | | | | | | | | Change-Id: I7b7b7f0642693900f7ba635414450750380955de Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Orgad Shaneh2019-04-071-1/+0
|\| | | | | | | Change-Id: I7d1912cd5c4d824fd40d3454c5f1bb796f2c21d8
| * Scroll Qt Quick Application Wizard: Enable minimal Qt version selectionAlessandro Portale2019-04-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the combobox for the minimal Qt Version in the "Scroll" Qt Quick Application Wizard visible. In contrast to the other Qt Quick Application Wizards, the "Scroll" variant had the minimal Qt version selection hidden. That was OK in the initial wizard commit, where only one Qt Version would have been selectable. But with the subsequent additions of Qt Versions in the wizard.json, the combobox visibility should have been changed to true. The consequence of the invisible combobox was that the default was secretly selected. The default was Qt 5.10 for a while. But the default changed recently with 52f95bae8b6a7c38b2d183522e1a7e550509d52f and caused QTCREATORBUG-22245. Task-number: QTCREATORBUG-22245 Change-Id: If4d2f384a28bf3dd130b097022ea6d8d30ef7509 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Widget App Wizard: Remove trailing colon from checkbox labelEike Ziller2019-04-051-1/+1
| | | | | | | | | | Change-Id: Ic0bf8ebe4e98a29b6ca08d496c79ea0032e0743f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Widget App Wizard: Move "Kits" pageEike Ziller2019-04-051-7/+7
| | | | | | | | | | | | | | | | | | The other JSON based project wizards first show the respective "Project Details" page, and the kits just before the summary. This makes sense, make the Qt Widgets Application wizard consistent. Change-Id: I8f91795498c6c5e432453b181fa11f0618080e3e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-04-025-5/+50
|\| | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/pythoneditor/pythoneditorplugin.cpp Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
| * Qml tooling: Support Qt 5.13 and change default to 5.12Alessandro Portale2019-03-285-5/+50
| | | | | | | | | | | | | | | | | | | | QtQuick 2.13 QtQuick.Controls 2.13 QtQuick.Window 2.13 QtQuick.VirtualKeyboard 2.4 Change-Id: Ib977d65294bca522e8ad6b5e1a96b3580a4d4313 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Move Qt Widgets Application wizard to JSONEike Ziller2019-03-2713-92/+342
| | | | | | | | | | | | | | | | | | 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>
* | Add more Python featuresCristián Maureira-Fredes2019-03-154-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the wizard related to Main Windows, not there are more options to specify the name of the files and classes. It's possible to Add and Remove files on Python projects that use the new .pyproject file. Improved the empty application, to template the .pyproject file and use the proper name for the file. Added the icons for file overlay. Change-Id: Iaba7feda69e0f608260b5fb1d1b04b2a42b08c2d Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-03-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/debugger/debuggerkitinformation.cpp src/plugins/languageclient/languageclientmanager.cpp src/plugins/plugins.pro src/plugins/projectexplorer/kit.cpp src/plugins/projectexplorer/kitmanager.cpp Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
| * Fix description of empty python projectRobert Loehning2019-03-051-1/+1
| | | | | | | | | | | | Change-Id: I9ccf09afc0fa6348454a0a23cf86812e50ecaaa0 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Say hello to Android CMake supportBogDan Vatra2019-03-061-1/+17
|/ | | | | | | | | | | | | | | | | | Requirements: - NDKr19 or newer - Qt 5.12.1 or newer QtCreator supports the following variables: - ANDROID_PACKAGE_SOURCE_DIR - ANDROID_EXTRA_LIBS Be aware, that there is a lot of magic done on QtCreator side, and you can't use only cmake to build an Android APK. [ChangeLog][Android][CMake] Add Android support for CMake projects. Change-Id: I1d351976ed56f424c2bc972f4ff7b5968147a2ed Reviewed-by: hjk <hjk@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 05:48:58 +0000