Commit Graph

905 Commits

Author SHA1 Message Date
Alessandro Portale
07b2a30dfe Qt Quick Application Wizard: Unify Qt version combobox entries
The "compat" variant, which was around for a long time, had a Qt version
combobox with entries following the "Qt x.yz" scheme. This change adds
the Qt prefix also to the combobox of the new wizard.

Fixes: QTCREATORBUG-29126
Change-Id: I4cd59f09248ba487077c2dcdd0828222311dd9a7
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-05-17 14:12:20 +00:00
Alessandro Portale
9b00ab8d79 Qt Quick Application Wizard: Fix a property assignment
The option "BuildSystem" does not exist, anymore.

Amends: fe45294357

Change-Id: I76aa3fe05cf1a4a4f74944d67d3fa7c6c273af6a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:24:52 +00:00
Alessandro Portale
fe45294357 Wizards: Remove build system step from Qt Quick Application wizard
Qbs is now covered by the "compat" wizard

This reverts commit 13cf1ee948.

Change-Id: Ic11a6bd4847d08b60f77421ecbc168bc46c50c6a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-05 15:16:26 +00:00
Eike Ziller
7724f8653f Merge remote-tracking branch 'origin/10.0'
Change-Id: I7a3925ad8e4f97461b64a70217102ed900430253
2023-05-05 10:39:47 +02:00
Christian Kandeler
dbfd378f5c Wizards: Fix "New Class" with QML_ELEMENT and no QQuickItem include
Amends 2f94e93334.

Fixes: QTCREATORBUG-29092
Change-Id: Ic27729a601534f5b4ed98451f637b9d49029a33a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
2023-04-28 12:52:46 +00:00
Leena Miettinen
e7b5e64a70 Doc: Remove detailed info about wizard templates
Improve descriptions of some wizard templates.

Task-number: QTCREATORBUG-28996
Change-Id: Ib53fa38918120af60a03f3850fed7db1e6f0c391
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-26 12:18:57 +00:00
Eike Ziller
c9696fbabb Merge remote-tracking branch 'origin/10.0'
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
2023-04-24 08:52:35 +02:00
Alessandro Portale
1e02f6bf98 Resuscitate the "legacy" Qt Quick Application wizard
Users still want to create new Qt Quick Application applications
targeting Qt 5 and with other build systems than cmake.

Fixes: QTCREATORBUG-28964
Change-Id: Ib87b7128f0b34eb4126ec771f324c70a960b2a03
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-04-21 18:42:21 +00:00
Eike Ziller
a353e9fde1 Markdown: Reuse Markdown highlighter from change log viewer
Change-Id: Ief1b0c135a34bfd5e9b5220e9fbf93f281d8e95a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-19 11:48:15 +00:00
Eike Ziller
b5d7b24733 Add wizard for markdown file
Fixes: QTCREATORBUG-29056
Change-Id: Ia2ba9aef86aab3e156e3c36d8e28c9f37d7da8b3
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-19 09:28:26 +00:00
Eike Ziller
2bc37de42b Merge remote-tracking branch 'origin/10.0'
Conflicts:
	src/plugins/python/pipsupport.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/examplesparser.cpp
	tests/auto/examples/tst_examples.cpp

Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
2023-04-13 15:59:08 +02:00
Christian Stenger
66f939c758 Wizard: Fix generated project file
Change-Id: Ibef37ad8ecc696a35766bbda94a113e747d69771
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-05 14:25:34 +00:00
Christian Stenger
0bb8cd2d68 AutoTest: Tweak wizard a bit
Provide a version for creating Boost tests using the
shared library approach.
Add second variant for creating Boost tests.
The former version is the header only variant and can
not get extended with further cpp files without
modifying project files and the existing cpp file.

Task-number: QTCREATORBUG-28846
Change-Id: Ie7ecc339dcbe11804ce19bdba20e8db36b893a50
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-05 13:52:05 +00:00
Alessandro Portale
c53c9592fa CMakeProject templates/examples: Fix the install line
The installation command needs to define
  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

Fixes: QTCREATORBUG-28999
Change-Id: If3f6ed15ef248eb07628bdc9fa4d11a678839a27
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2023-04-05 08:47:20 +00:00
Eike Ziller
b635e99086 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/libs/utils/multitextcursor.cpp

Change-Id: I54b00ea5e6953078beed7673b5de31114f983bfa
2023-03-31 15:58:09 +02:00
Christian Stenger
7eafcf3259 AutoTest: Fix generated pro file
Change-Id: I2b10ad89e32cbf118823c32bf9561ba9d7a8819f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-31 06:09:38 +00:00
David Schulz
1811c31490 Python: add interpreter selector to the python project wizard
Change-Id: I7ea1df34fa0096a84a0d611b401f991508c826c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-14 05:44:46 +00:00
Eike Ziller
c7e94d80c7 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	src/shared/qbs

Change-Id: I33e13270c8c15a51b4ce4eaa6b4584041ed124e0
2023-03-13 12:30:04 +01:00
Christian Stenger
87be1f6370 AutoTest: Tweak generated cmake project file a bit
Using Quick Test with cmake as "build tool" does not list the
important part for the testing - the test sources.
Explicitly add the qml files to the project and list them to
be able to see and access them directly.

Change-Id: Id136a017989a5bfb4b9058576e008edb792e5866
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-09 10:08:13 +00:00
Eike Ziller
c8567312f6 Plugin wizard: Fix missing include, add some test infrastructure
Just basic CMake setup that is needed for actually adding tests.

Change-Id: Ief778c28f27ff122c82a190a334b7a932bead658
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-01 14:06:24 +00:00
Friedemann Kleint
03e1c18f78 Qt Designer Custom Widget wizard: Generate XML as raw string literal
It makes it easier to customize it later on.

Change-Id: Ie4ac7830a5544746d621b5ba34d174b3f8e3676a
Reviewed-by: hjk <hjk@qt.io>
2023-03-01 09:16:24 +00:00
Friedemann Kleint
745de1b34d Qt Designer Custom Widget wizard: Update code templates
- Introduce nullptr, member initialization, override.

Change-Id: I1088e124bf554050f71f002e6af31a2432479f99
Reviewed-by: hjk <hjk@qt.io>
2023-03-01 09:16:16 +00:00
Friedemann Kleint
e538e8f2e7 Qt Designer Custom Widget wizard: Remove remains of Qt 4
Clean the .pro files and use Qt 5 plugin metadata instead of old
exports.

Change-Id: I24c96d90f5dc45ecd20064159eb175e0e0475a34
Reviewed-by: hjk <hjk@qt.io>
2023-03-01 09:16:05 +00:00
Fabian Kosmale
49561eaeb8 qtquickapplication wizard: Adapt to CMake API change
During API review, it was decided (and implemented) that REQUIRES is the
better/more descriptive keyword than MIN_VERSION.

Change Creator's wizard accordingly.

Change-Id: I831cdc956204b1e379c3815104698d3f881abf6c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 11:58:22 +00:00
David Schulz
739d4942e2 Merge remote-tracking branch 'origin/master' into 10.0
Change-Id: I9f6090e2a9f62fd3a9823f5a7342ea423dfbb2ac
2023-02-01 05:24:33 +00:00
Alessandro Portale
97002f934f QmlProjectManager: Fix the "Qt Quick UI Prototype" wizard
The wizard uses the the same main.qml.tpl template as the "Qt Quick
Application" wizard. That file was renamed to Main.qml.tpl.

Change-Id: I7978cd2a09da7aa70a75f9cc5cb6e7b6dcdff058
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-01-31 08:33:17 +00:00
Fabian Kosmale
fa2ea6fd97 QtQuickApplication template: Support more modern API
(Re)add a way to select the minimum supported Qt version. If it is >=
6.4, connect to QQmlApplicationEngine::objectCreationFailed instead of
objectCreated, getting rid of the status check.
Moreover, if we have Qt >= 6.4, also use qt_standard_project_setup
instead of manually enabling AUTOMOC. That is available since 6.3, but
no need to clutter the version selection list with too many entries.
If only 6.5 or higher is required, put the QML files under
AUTO_RESOURCE_PREFIX, and use loadFromModule instead of load.
Unconditionally rename  main.qml to Main.qml, which is necessary for
loadFromModule to work, and making this conditional on the used Qt
version is more trouble than it is worth.

For qbs, we do not yet put the files under the auto resource prefix, so
do not use loadFromModule there.

Fixes: QTBUG-47996
Change-Id: Ib8ca375c2316b58eecf54009d36fc9f7dac7c1f4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-31 06:38:19 +00:00
Tasuku Suzuki
8cb0858574 Improve console app template
Set QtCore explicitly instead of removing QtGui from default modules.
Update CONFIG with the new feature introduced in QTBUG-27079

Change-Id: Id2b5cc7c9534618b88c4683253af6c2a8fd90816
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-30 13:47:32 +00:00
Tasuku Suzuki
2f94e93334 "New Class" wizard: Add QML_ELEMENT checkbox
Change-Id: I219b539ba5f36c895be1042a74571e54a0c67ec6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-30 13:46:49 +00:00
Alessandro Portale
0a30b8aa26 QmlProjectManager: Fix Qt Quick UI Prototype wizard
Fix the path to the main.qml template. Remove all Qt version quirks,
since "Qt Quick Application" project wizards are for Qt 6 from now on.

Amends: 4e0b4fcc92

Fixes: QTCREATORBUG-28722
Change-Id: I338f52f215afc8591fadb12c2ad3ca58d32ec7c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-30 13:39:19 +00:00
Christian Stenger
13cf1ee948 Wizards: Re-enable using qt quick wizard for qbs
Change-Id: Ic1a3dfbb72096470b4cec2d7af967eba111c743f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-19 12:54:00 +00:00
David Schulz
c4f6fd5dd2 Python: Remove wizard for dynamically loaded ui projects
The dialog and main window variant of this wizard was broken since ever.
Generally two widget ui templates are generally confusing for the user,
so remove the broken wizard that promotes the not recommended way of
using ui files. Also we support the automatic conversion from ui to py
files nowadays via the PySide6 project tool.

Fixes: QTCREATORBUG-25807
Change-Id: I3ec6000a6c3fb076e3a54c70f3cccdd12df28701
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-11 08:42:17 +00:00
Alessandro Portale
4e0b4fcc92 QtQuick Application wizard: Add "QDS style project" option
This adds a checkbox labeled "Design Studio style project" to the
Wizard. With that selected, the project is generated via the "General /
Empty" templates of QDS with Qt 6.2 as target Qt version, 1920x1080 form
size, the "Material" QtQuick.Controls style ("Light" Theme) and CMake
project format.

At the same time, the preexisting QtQuick Application wizard in Qt
Creator now also focusses on Qt 6.2 and CMake. TS file generation is
removed for now, can be added later, but then using the i18n setup
feature of QQmlApplicationEngine (instead of a QTranslator in main.cpp).

The wizard now focusses on the QML CMake API. In order to filter the
kits accordingly, the flag "QtSupport.Wizards.FeatureQtQmlCMakeApi" was
added.

Task-number: QTCREATORBUG-28436
Change-Id: I80bc5585f31ec82c64f845701c768f8a07e000da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-05 13:09:59 +00:00
Cristian Adam
b36cc91acb Qt Creator Plugin Wizard: Update GitHub Actions yml file config
- move to only Qt6 builds since Qt Creator 9 only supports Qt6
- update the CMake Version
- update actions package versions not to get deprecated warnings
  from GitHub

Change-Id: Ief6c526ade69b4b120f614081bebfff5809101eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-15 08:38:08 +00:00
Tim Jenssen
63d3a6bd3d Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
  src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
  src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
  src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I24216ae3f83cdde3493b4a6274e24a72f75820fc
2022-11-09 11:45:25 +01:00
Eike Ziller
9eebcf3ef0 Restrict Python application wizards to desktop
Fixes: QTCREATORBUG-28258
Change-Id: I9814abe093efbff0b7b15711d4773c8cbcdc8e41
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-11-07 13:56:55 +00:00
Thomas Hartmann
b1c48a27c0 QmlDesigner: Move effect wizard to qmldesigner/studio_templates
This is the folder QDS looks for the wizards.

Change-Id: Id69f50f48eeb4668dff2840a36149408e0709a06
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-01 19:14:08 +00:00
Eike Ziller
b402f35481 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
	src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp
	src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designercore/model/import.cpp
	src/plugins/qmldesigner/designercore/model/model_p.h
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp

Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
2022-11-01 15:38:49 +01:00
Tomi Korpipaa
02f7c9c3eb Import QQEM effects via drag or add button
Be able to add effects using file system drag&drop or using the add resource button

Task-number: QTBUG-100626
Change-Id: I33c3ebe29797325a2ed1819bd867e97ae3f8b61c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-01 12:55:28 +00:00
Orgad Shaneh
7388003d16 Wizard: Add CMakeLists.txt.user to generated .gitignore
Fixes: QTCREATORBUG-25969
Change-Id: I72c8da5400e41194db6b239c2845fe110c2e3cf7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-11 17:27:03 +00:00
Christian Stenger
c42ae96ba8 Squish: Move wizard into plugin
Avoids a soft assert when parsing the wizards without having
the Squish plugin enabled.
As the Squish wizard is using customized wizard generators
that are only available if Squish is loaded we should limit
the presence of the wizard file to this case.

Change-Id: I091c1e429f28b07679245abdc9a638135af84761
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 09:31:34 +00:00
Alessandro Portale
c06fab97f1 Wizards: Port "Code Snippet" Project Wizard to .json wizard
Code Snippet is the last .xml-based wizard shipped with Qt Creator.
This change ports it to the .json-based wizard format. Instead of
supporting just qmake-based projects (like it did), the new version
supports just CMake-based projects.

Change-Id: Ie64114165fff5d56ddf82041cc4d5f90c44fe77b
Reviewed-by: hjk <hjk@qt.io>
2022-09-27 14:29:05 +00:00
Christian Kandeler
aed001650a Project wizards: Do not use CMAKE_INCLUDE_CURRENT_DIR
This is an anti-pattern that lets uneducated and/or careless developers
get away with using the wrong type of include, so we should not
encourage its use.
It's also not needed by the wizard-generated code.

Change-Id: Iae508025bcd6659ed5aeb546a3da5f8f72e75059
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-26 13:55:16 +00:00
Christian Stenger
8cfbaa1da9 Squish: Add Create New Squish Suite
Change-Id: I9246f22bb5f4cbccb2fd4d39218e4d6594f88a89
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-09-22 12:05:29 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Alessandro Portale
90e691251f Fix install command in wizard generated CMake files for Android
"error: install TARGETS given no LIBRARY DESTINATION for module target
<...>."

Change-Id: I9b283e342b32c7d3df44bb5aed231b843e3e54ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-24 11:53:17 +00:00
Christian Stenger
fcb2807efa Wizards: Make PySide6 default
Change-Id: I6d84261e56dafcd55b7842e140d9c09935df70a8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-20 12:26:03 +00:00
Christian Kandeler
07dfd7c0b3 Wizards: Bump QtQuick import version in file wizards
Use 2.15 as default, plus a little heuristic to use the same version as
other files in the project.

Fixes: QTCREATORBUG-27614
Change-Id: Ic84db5da97a9f35a2ad0e57fd47b75fb32a0b7f8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-16 08:23:14 +00:00
Eike Ziller
87645d7355 Fix Qt Quick Application wizard for Qt >= 6.2
Wrong variable used in the template's CMakeLists.txt resulted
in errors when configuring.

Amends db2cc2ba27

Fixes: QTCREATORBUG-27725
Change-Id: Id644ba83e118de1f12f4cdb4caa6368bd418419d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-06-16 06:18:02 +00:00
Eike Ziller
db2cc2ba27 Add install command to wizard generated CMake files
Add a default install(TARGETS ...) command.
It doesn't hurt on desktop and mobile targets, and it is required for
deployment on remote Linux devices.

Change-Id: Ib39c6130b63a9a699ff5cd81756c2913b1246142
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-14 07:45:00 +00:00