Commit Graph

657 Commits

Author SHA1 Message Date
Christian Stenger
d90da11f07 AutoTest: Update Qbs/GTest wizard
Instead of using undefined objects pass the needed objects around
to access them inside the JavaScript file.
Also update deprecated function use.

Change-Id: I4c0cafc319047d0b72a0f9310e5335f793f800ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-03-09 15:47:57 +00:00
Alessandro Portale
3f757998b5 Revert "Wizards: Accept asynchronous root components for qqapplication"
This reverts commit dcb8681cb7.

The effort to handle asynchronous loading is not required for the
qmllivepreview (for which it had been introduced).

Task-number: QTCREATORBUG-19648
Change-Id: I20cbd318dedb3da43d4993c0c0a1910ffe6d5761
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-02-06 09:50:02 +00:00
Leena Miettinen
b9d95f7946 Auto Test: Fix UI text in wizard
Change-Id: I38057341ef2e5a95e44a111742537bd3cb67bbdd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-06 07:46:35 +00:00
Thomas Hartmann
d110b2f4db CppEditor: Require CppEditor plugin for C/C++ wizards
Change-Id: Ia6371d6cdb8c42df92c3261050262c37a3ff2c60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-05 09:06:24 +00:00
Thomas Hartmann
84b90abb9b ScxmlEditor: Require ScxmlEditor plugin for wizard
Change-Id: If5892f37b9e8d919100a659629e6e2325e25cc83
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-05 09:06:14 +00:00
Christian Stenger
e43668f603 AutoTest: Provide missing QtQuick test template
The Auto Test Project wizard had minimal templates for
QtTest and GoogleTest. Provide the QtQuick minimum
template as well.

Task-number: QTCREATORBUG-19579
Change-Id: I0efc1915c3bd0c251d8b94c50ed7ed6341812242
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-01 09:23:07 +00:00
Eike Ziller
97631cfdb8 ModelEditor: Add text to scratch model wizard icon
Like for the non-scratch wizard, separating it from SCXML.

Change-Id: Ia0ce6bad14dae8c3d7522c1d1dcdc4d87f77b77e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-01 08:46:09 +00:00
Christian Stenger
2e8527c7e5 Wizards: Fix QtQuick - Empty wizard for cmake
cmake does not automatically set the C++ standard to C++-11 when
using Qt5.6. Explicitly set it to have a compiling template.

Task-number: QTCREATORBUG-19670
Change-Id: Ibba1f58951f96c4834985bff2298d606e9aa56bc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-29 10:54:10 +00:00
Robert Loehning
63e47f903f Improve translated strings and make them consistent
Change-Id: I88a6e6ceaa44b22539449037faa788caa9f349fc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-01-22 11:56:01 +00:00
Jochen Becher
58a1648326 ModelEditor: add wizard for scratch models
Change-Id: Idc6841984aa258ab668416f891ecbaf7bd32164e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:53 +00:00
Christian Stenger
38d5c585af AutoTest: Fix wizard for gtest on Windows
Change-Id: Iab9711df2455fc2efb678bfd85e8a95b2de7587c
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-08 14:20:02 +00:00
Eike Ziller
469edcdde3 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa
2017-12-12 10:53:51 +01:00
Alessandro Portale
a53df3892a Qt Quick Application wizards: No AA_EnableHighDpiScaling on Simulator
Avoid setting Qt::AA_EnableHighDpiScaling when running in the simulator.
Simulator detection is done by testing whether environment variable
QTGLESSTREAM_DISPLAY is set.

This amends 8c3bd61594 where all platforms
except Windows were excluded from setting the flag.

Task-number: QTBUG-64815
Change-Id: I8ab7ba9f24217915dc1d01e1f2eb5c37923c5504
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2017-12-11 10:16:25 +00:00
Eike Ziller
e2baa116ca Merge remote-tracking branch 'origin/4.5'
Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
2017-11-29 09:56:22 +01:00
Alessandro Portale
8c3bd61594 Qt Quick Application wizards: Qt::AA_EnableHighDpiScaling only on WIN
Setting Qt::AA_EnableHighDpiScaling causes a few graphics backends to
malfunction. This patch reduced the setting of the flag to happen only
on Windows (it is automatically set on macOS with retina).

Task-number: QTBUG-64815
Change-Id: I08fa5d1bd2c93e7a39c23487b684bd3f7b358783
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
2017-11-28 13:36:29 +00:00
Eike Ziller
f58a617ea9 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iab6befd5e713289877aa0a47b9ce6bddfb5e2593
2017-11-16 08:49:06 +01: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
Christian Stenger
895eed7164 Wizards: Fix project files for macOS
Task-number: QTCREATORBUG-19286
Change-Id: I81a7486edfd34570d7b4bd82646a2e5e39a585ee
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 10:55:33 +00:00
Eike Ziller
2d30d3ddd6 Merge remote-tracking branch 'origin/4.5'
Change-Id: Ib6739725e6b251ea962880e4b72700c5be5a192c
2017-11-14 11:24:03 +01:00
Tim Jenssen
7bad32988f Wizards: remove unnecessary default values
Change-Id: Ie06b32a6d56e3f0110c0526b45fcf530e3491433
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-14 09:06:18 +00:00
Alessandro Portale
1a361a39ad QtQuick Canvas3D wizard: Remove unused variable
The variable QtQuick3DVersion is unused.

Change-Id: I714948879ce1994812ffcd997e39653081479509
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 15:07:08 +00:00
Orgad Shaneh
a6cda6dbe0 Merge remote-tracking branch 'origin/4.5'
Change-Id: I16e3bb9ee3a1e6dc6edf7a65f8a137a25cda4fe3
2017-11-05 16:49:17 +02:00
Leena Miettinen
d8afb51c92 Wizards: Fix copy-paste error in Swipe view wizard description
Mentioned a StackView and a Drawer, which do not seem to be used in
the example. Also contained "with a" twice.

Change-Id: I51916b73731224cb633bd90f724ec7f4c2b89f91
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-01 14:38:33 +00:00
Tim Jenssen
2918cc59f8 Wizards: fix wrong json files
Change-Id: I185d1b559f53fa91731783c723bfffb78e93886b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-26 17:48:53 +00:00
Tim Jenssen
bd65ae1def Wizards: remove default values
Change-Id: If58b6b9753ccb3cb3baae8198c6e9e5369840ddb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-26 11:32:40 +00:00
Tim Jenssen
5dbc9cb370 Wizards: remove wrong used wizard.json property
Change-Id: I37fa72cc4283a745a05a55d4c19a31e7ead59557
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-26 11:32:28 +00:00
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02: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
Andre Hartmann
57e35274c2 Wizards: Prettify template QMake project files
Having each source/header/form file on its own line
makes further moving around (e.g. sorting) much easier.

Also bring indentation for source/header sections to
the same level.

Amends commit cf40d98dc9

Change-Id: I95ad9c9298ae01e548a595b29d7f7651220adadd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 10:29:41 +00:00
Ulf Hermann
dcb8681cb7 Wizards: Accept asynchronous root components for qtquickapplication
There are a number of reasons why the root component of a QtQuick
application may be loaded asynchronously. It might, for example, be
derived from a component loaded over the network.

In that case, checking that there is a root object right after calling
load() is misleading. The object is only created later. Therefore, we
need to listen for the objectCreated signal to decide if the root
component was correctly created.

As calling qApp->exit(-1) does nothing while the event loop isn't
running, we always connect the check with Qt::QueuedConnection.

Change-Id: Ie2814894b79bb3e467c5a838c7ec419291fcf591
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-10-06 10:37:55 +00:00
Orgad Shaneh
2a9f45c567 AutoTest: Reorder build systems for consistency
+ Only enable qmake when the plugin is enabled.

Change-Id: Id2a7600a1e71daf14a050ec7ac3247de795a2835
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-18 12:25:06 +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
Alessandro Portale
f752fbb5cc Wizards: Refresh the Canvas3D Application wizard
...and move it under qtquickqpplication

Change-Id: I7e402424075583fe895aaa1cb6e877351098015b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-07 10:25:57 +00:00
Alessandro Portale
e6bea5c3e2 Wizards: Add a Qt Quick Controls 2 "Scroll" wizard
Creates a Qt Quick Controls 2 application with a ScrollView to display.

Change-Id: I6367b8d39eea632469f62f1fc1b99790121ff00e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-04 14:41:23 +00:00
Alessandro Portale
090278b097 Wizards: Refresh the Qt Quick Controls 2 Application wizard
This new "Swipe" wizard is the replacement for the old
Qt Quick Controls 2 wizard.

Change-Id: I5969894888785ee27d96fa722e388cd69782fff0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-04 12:22:08 +00:00
Alessandro Portale
dbf9bd444b Wizards: Refresh the basic Qt Quick Application wizard
It now really creates an empty project.
Also, adapt the QtQuickPrototype template accordingly.

Change-Id: I0749805211df080c88cad1b9c2d476d56836c18a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-02 17:00:52 +00:00
Alessandro Portale
9113125a5e Wizards: Add file extension as text overlay to some wizards
Change-Id: Ibfd1144271c4381c7125db80713cbde431a54cf7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-24 15:32:24 +00:00
Alessandro Portale
e65d4c6f65 Wizards: Make the big wizards icons smaller
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>
2017-07-21 07:49:00 +00:00
Alessandro Portale
3be1af37e6 Wizards: Use the new icons for the Qt Quick Application Wizard
Task-number: QTCREATORBUG-18550
Change-Id: Ic91979393a8e2ea54a0d0ab10135028b42efba97
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-18 09:05:09 +00:00
Alessandro Portale
c77e76dd6d Nim: Update the Nim wizard icon
The icon should have the same size and look as the other icons.

Task-number: QTCREATORBUG-18550
Change-Id: I16ee48196a14878858f02cabe0678342b4abb44f
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-18 08:58:06 +00:00
Tim Jenssen
0448ac5ce2 add style icons to wizards
Change-Id: Ia5741e68d9ce0a812080bfba7b120f5d5575c210
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-06-13 11:03:12 +00:00
Mitch Curtis
377979fe5e Update wizard template icons
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>
2017-06-06 12:22:06 +00:00
Orgad Shaneh
89057b552b Merge remote-tracking branch 'origin/4.3'
Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45
2017-06-02 15:13:51 +03:00
Kari Oikarinen
e4248464df Use virtual keyboard with Boot2Qdb plugin also
Starting from 5.9 Boot2Qt devices are supported with a new plugin and
projects created with wizards should still use virtual keyboard for
them.

Task-number: QTCREATORBUG-18247
Change-Id: I5dcc6436d49d29cb8956a2b7d5eec72ff5542f10
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-31 06:02:40 +00:00
Jochen Becher
89a6ec4db3 Modeling: Add project management page to wizard
Change-Id: Ia70d397b7e9489eab35264624aa78ee63be99ca8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-29 18:59:05 +00:00
Orgad Shaneh
8430da3bf7 Merge remote-tracking branch 'origin/4.3' into master
Change-Id: I01ab8c85ea3372b6dce4142ddb9cf92d903ffca6
2017-05-23 23:41:40 +03:00
Friedemann Kleint
cf807253e4 QML application wizards: Add code to bail out on load errors
When something goes wrong with deployment or there is a syntax
error in the QML files, the old code would enter the main
loop not showing any windows. Worse, the binary is then locked
on Windows and cannot be overwritten. Add a clause checking
whether there are any root objects and bail out on failure.

Task-number: QTBUG-60764
Change-Id: I3620a09ec4331dc04a5194dfd2ece2ff44bdc429
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-05-16 14:04:03 +00:00
Tobias Hunger
76e9100a66 Wizards: Update Qml-related wizards with documented QRC file syntax
Task-number: QTCREATORBUG-18149
Change-Id: Ic63e3c35bb6c52dfa6d3b10c32e0c49077618656
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-05-05 08:50:58 +00:00