Commit Graph

23 Commits

Author SHA1 Message Date
Eike Ziller
6bb918adab Merge remote-tracking branch 'origin/4.15'
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
2021-05-10 13:50:58 +02:00
Kai Köhne
1e80ed9b78 Qt Quick Wizards: Remove Qt versions older than Qt 5.12
That doesn't mean we don't support older versions. But I don't think
we should advertise creating new projects for it.

Change-Id: Ia9b97cc072232238baffd10b159f604f1a6413d1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-07 13:18:41 +00:00
Kai Köhne
53c0b82a93 Add "Minimal required Qt version: Qt 6" option to QQ application wizards
Provide a Qt 6 option that does not use any versioned imports.

Also make Qt 5.15 the new default.

Fixes: QTCREATORBUG-24973
Change-Id: I43714e5e344d1d91d35c5ad298edf28bc32ff7d6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-06 15:00:24 +00:00
Mitch Curtis
357e70279c Update usages of Qt Quick Controls 2 styles
The Default style was renamed to Basic
(9219e86aa571d8b2f5da1ec92a461e5add38f57c) and we now default to a
platform-specific style (8b534487044dfb3b464431ecb91ef4e0864af4ed) if
available.

Task-number: QTBUG-85984
Task-number: QTBUG-86403
Change-Id: I66d2188a0c45605abdbbd8c71396b16407166d75
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:39:32 +00:00
Alessandro Portale
6c14b4dfaf QtQuick Application Wizards: Set default Controls Style to "Material"
The Controls Style "Default" that is currently by default in the
generated qtquickcontrols2.conf is not present in Qt 6. That leads to
QML runtime errors and aborting applications with Qt 6.

Let's switch the default to "Material" which is available since Qt 5.7
and present in Qt 6.

Fixes: QTCREATORBUG-25027
Change-Id: Ic8b631b771487624d7459a276d290b80c7ad8be0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-02 07:38:25 +00:00
Mitch Curtis
e96b00bfb4 Qt Quick templates: move visible assignment after width and height
This is more common; visible and enabled are usually after size-related
bindings.

Change-Id: I2148491d8a8fdbf4f7bc2b261bd6472bae697969
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-20 12:52:33 +00:00
Thomas Hartmann
34f417a2e4 Qml tooling: Support Qt 5.15
...and keep the default at 5.12

Change-Id: I15439c2d71a0610971dc39246e8b98e9653b8f04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-19 13:22:24 +00:00
Christian Stenger
03ddc603cf Wizards: Split Application category
It lately became messy and it feels like it is
time to clean up these a bit.

Change-Id: I7b5da97cd7ad4231e28db13c98db16c656c8a6b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-27 07:00:57 +00:00
Alessandro Portale
dea46dd04e Qml tooling: Support Qt 5.14
QtQuick 2.14
QtQuick.Controls 2.14
QtQuick.Window 2.14
QtQuick.VirtualKeyboard 2.14

Change-Id: Ide447cf8f5beae481495e6c7220dfc075d6e859f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-01 08:34:55 +00:00
Christian Kandeler
4702faba06 Wizards: Add the ability to remember user choices
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>
2019-09-23 12:48:56 +00:00
Christian Kandeler
2feb3e5585 Qt wizards: Include translation file, if requested
Provide all wizards for Qt-based projects with the ability to set up a
skeleton .ts file and add it to the generated project.

Task-number: QTCREATORBUG-7453
Change-Id: I4dfb34c0101062edd0209173f83737e69063e27a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-08 08:56:38 +00:00
Christian Gagneraud
71751bb2fc Export Wizard values to JavaScript macro (Fixes)
This fixes a few misses from e0d38ae414

Change-Id: Ibd0253ca4045afe3745cafeca2f57b083e141bd3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-10 11:45:52 +00:00
Eike Ziller
e0d38ae414 Export Wizard values to JavaScript macro
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>
2019-05-09 11:19:43 +00:00
Alessandro Portale
52f95bae8b Qml tooling: Support Qt 5.13 and change default to 5.12
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>
2019-03-28 08:03:25 +00:00
Eike Ziller
69b111b3c7 More Qt Quick wizard fixes for Qt 5.12
Task-number: QTCREATORBUG-21476
Change-Id: Icadcf12dc59786a62205cccc917a13b42f55b782
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-11-14 14:10:22 +00:00
Eike Ziller
2bf9333e4c Fix Qt Quick wizards with Qt 5.12 / ECMAScript 7
The expression that we used either worked in ECMAScript 6, or only
accidentally worked in QJSEngine in Qt 5.11.

Fixes: QTCREATORBUG-21476
Change-Id: Id2ce0932ead24c8caef9a82b10a173dfdcf1e927
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-11-14 13:09:07 +00:00
Alessandro Portale
70fdbedbd8 Qml tooling: Support Qt 5.12
QtQuick 2.12
QtQuick.Controls 2.5
QtQuick.Window 2.12
QtQuick.VirtualKeyboard 2.4

Change-Id: Ie4a60ac93b25ca735e28ac84447cfe60778f8d7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-09-13 13:38:09 +00:00
Alessandro Portale
b3d291d230 Qml tooling: Support Qt 5.11
QtQuick 2.11
QtQuick.Controls 2.4
QtQuick.Window 2.11

Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-12 09:16:21 +00:00
Alessandro Portale
71933a4df8 QtQuick wizards: Add 5.10 to minimal required Qt versions
QtQuickVersion: 2.10
QtQuickControlsVersion: 2.3
QtQuickWindowVersion: 2.10
QtQuickVirtualKeyboardImport: QtQuick.VirtualKeyboard 2.3

Qt 5.9, which is LTS remains preselected.

Change-Id: Ida5c234431af8cf681ad6f8206283f9a4048bcec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 13:34:42 +00:00
Alessandro Portale
92fa3a756e QtQuick wizards: Bump virtual keyboard version for Qt 5.9
According to the Qt 5.9 documentation it is
   import QtQuick.VirtualKeyboard 2.2

Change-Id: Ic560e187f57e9db9e8552ec0f407766e74d20d7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 13:34:37 +00:00
Leena Miettinen
b3dd11e49b Wizards: Remove period from a checkbox label
Change-Id: I2046652e5ee16b29c86ac0400f9ee3572904152a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 14:41:37 +00:00
Christian Stenger
13a1f8686c Wizard: Fix Qt Quick Application wizards
They had been moved in sub directories and referencing of the
git.ignore file was not adjusted accordingly.

Task-number: QTCREATORBUG-18842
Change-Id: Id5f720015e94cb581d6b6337080de0c35c90e232
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-09-06 19:24:51 +00:00
Alessandro Portale
16b2b16238 Wizards: Add a Qt Quick Controls 2 "Stack" wizard
For applications with stack navigation

Change-Id: I33eea6460ad416755d25660f206dfe61ec555b88
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-07 14:48:18 +00:00