Commit Graph

7857 Commits

Author SHA1 Message Date
Thomas Hartmann
6929da3983 QmlDesigner: Adjust gradient dialog
Change-Id: I21eea31024c6fc959dd27654711607f3ff8a4d49
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-05-16 08:08:30 +00:00
Christian Kandeler
61340e1543 Fix error message when adding empty qmake project as subproject
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>
2019-05-15 13:36:37 +00:00
Christian Gagneraud
3b596eef40 JSON wizard: Fix invalid json files
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>
2019-05-13 07:40:41 +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
Thomas Hartmann
cb5e9e9479 Fix controls 2 imports
The minor versions of controls 2 imports are now
in sync with Qt/QtQuick.

Change-Id: Iddc76d72cc9c078c24fa3a84b0a305226d98ea5c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-05-10 09:48:41 +00:00
Alessandro Portale
5311708845 python scripts: Use "not in" operator to test membership
As per suggestion from Pyls, this changes
  if not needle in haystack:
to
  if needle not in haystack:

Change-Id: I4a482604e13e61ecee9e02935479632419710ff7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-05-10 05:53:39 +00:00
Christian Stenger
4f989d6543 Wizards: Fix java file wizard
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>
2019-05-10 05:47:17 +00:00
hjk
14300bd477 Debugger: Disable Kit dumper
Broke when Kit guts were converted to use unique_ptr

Change-Id: Id38d53c56448cd2edde09e3b27e38a24bcfbb37c
Reviewed-by: hjk <hjk@qt.io>
2019-05-09 12:49:55 +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
Eike Ziller
4545c81e57 Merge remote-tracking branch 'origin/4.9'
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
2019-05-08 12:41:25 +02:00
Christian Kandeler
c770d3f4a7 Wizards: Allow non-existing base directory for new files
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>
2019-05-08 09:22:57 +00:00
Alessandro Portale
fa46871fe2 Qt Creator Plugin Wizard: Use 'override' in generated code
...otherwise Qt Creator immediately underlines the code it previously
generated.

Change-Id: Id2355c3a1bd070a5bc40b9d02cb2dabe730d9790
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-08 05:51:32 +00:00
Alessandro Portale
6a4250d09f QtQuick2 extension wizard: 'explicit' and 'override' in generated code
...otherwise Qt Creator immediately underlines the code it previously
generated.

Change-Id: Ia751f405f918c5736469fb245099af135374edb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-08 05:51:07 +00:00
Christian Gagneraud
27a472aa30 Fix typo in wizard.json
Change-Id: Ie7a51f5bd65a8d82b32dc95dfbcf89ea09c45227
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-07 07:27:57 +00:00
Christian Kandeler
24263717f3 Make QtWidgets wizard work with namespaced Qt
Fixes: QTCREATORBUG-19590
Change-Id: Ic003b2b1f580d9a6708e144b690c4cee8d94ff69
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-04-30 10:50:10 +00:00
Christian Kandeler
a296b84dc4 Wizards: Fix include statements
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>
2019-04-30 10:47:44 +00:00
BogDan Vatra
ac91f6f452 Update QBS template
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>
2019-04-29 17:30:40 +00:00
Marco Bubke
625ecdf687 Clang: Fix export statements for indexing
Change-Id: I1817089f35d625a91fdae3446eb22655ce0f29cb
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-29 13:40:28 +00:00
Marco Bubke
2d520140d0 Clang: Fix system pre include search path
We now get the resource path from creator. The -fPIC case is working now
too.

Change-Id: Id191e89e6d46706748d50440038a06a349972cc9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-29 12:52:05 +00:00
Christian Stenger
8be20fcc37 Wizards: Fix Quick UI wizard by adding a kit selection page
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>
2019-04-29 12:03:27 +00:00
Thomas Hartmann
f8202239d6 QmlProject: Implement basic support for QmlFileSelector
This patch adds support for QmlFileSelector for
QmlProject and Qt Quick Designer.

Task-number: QDS-590
Change-Id: I0cc043d3ec9578008ec879b36fe834b70fb8c5ad
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-04-25 13:55:29 +00:00
Robert Loehning
5caf7c39c2 German translation: Consistently use "Verzeichnis"
Task-number: QTCREATORBUG-21364
Change-Id: Ifbbcf7996ad3be95b8273a9b533d34cdfaa4334d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-04-25 09:23:20 +00:00
Christian Kandeler
dfeb024583 C++: Do not apply "Lower-case file names" setting to file wizards
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>
2019-04-25 08:46:51 +00:00
Marco Bubke
3bd653416a Clang: Add global preincludes search path
Some header like windows.h adds dangerous defines which are not used but
break the indexing like "small". We now preinclude them and undefine the
dangerous the defines. This can be used for speed up the indexing as we
could provide stripped headers.

Change-Id: I2a89a4719ada7591e0e7a1ecc411b2e0ffd40d9a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2019-04-23 09:08:25 +00:00
Robert Loehning
a6069aee0b German translation: Replace "mit Hilfe"
Change-Id: I8714c692a6b5a946975cff7f913c3f75989ecabd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-04-18 14:00:29 +00:00
Alessandro Portale
fa11c2f022 JSON C++ Library wizard: Avoid some empty lines in output
Change-Id: I251299a2faf8580d199d6b0c0688904f59f13311
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-17 14:58:22 +00:00
Eike Ziller
cb63706f83 Move C++ Library wizard to JSON
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>
2019-04-17 10:53:21 +00:00
Eike Ziller
75696f9639 Merge remote-tracking branch 'origin/4.9'
Change-Id: I95c56cc9371959f96afde3677fc82481f36f66c8
2019-04-12 14:31:01 +02:00
Haxor Leet
131ce54bee Russian translation: fix untranslated 'space' in editor
Change-Id: I9594f8c201ce785d740e1e59ed96fcce9ad3ffd6
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2019-04-12 10:43:24 +00:00
hjk
e95fd876aa Debugger: Make the time stamp recording option work for single items
Should help to drill down to individual expensive dumpers.

Change-Id: I983ba075231784f71dd9d5c3bda375a3ee508bf6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-12 08:32:52 +00:00
Christian Stenger
6f21be2b9a AutoTest: Fix wizard for qbs and cmake
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>
2019-04-09 08:08:22 +00:00
Christian Kandeler
ef9e6fbcd7 Add Qbs support for the QtWidgets application wizard
Change-Id: I7b7b7f0642693900f7ba635414450750380955de
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-04-08 08:01:24 +00:00
Orgad Shaneh
39ba01da71 Merge remote-tracking branch 'origin/4.9'
Change-Id: I7d1912cd5c4d824fd40d3454c5f1bb796f2c21d8
2019-04-07 23:13:17 +03:00
Eike Ziller
c79fcc8fe3 Widget App Wizard: Remove trailing colon from checkbox label
Change-Id: Ic0bf8ebe4e98a29b6ca08d496c79ea0032e0743f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-05 07:12:20 +00:00
Eike Ziller
6d6fc18161 Widget App Wizard: Move "Kits" page
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>
2019-04-05 07:12:11 +00:00
Aleksei German
092d969f10 QtDesignStudio Gradient Picker Dialog
Dialog allows you to save your gradients and to use stored presets,
including system gradients.

Change-Id: I6888446afd63c00f3cb8d9277d9e37517243491f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-04 13:35:44 +00:00
Alessandro Portale
1d2fa1d618 Classic theme: Add missing FancyTabBarSelectedBackgroundColor
In fact, that color is not used in the non-flat classic theme. But
without it, the theme reader complains:
  Theme "default.creatortheme" misses color setting for key
  "FancyTabBarSelectedBackgroundColor".

Change-Id: I81462510150c1dc4fbb3d0bf5d7a2d610abb1f10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-04 06:56:32 +00:00
Thomas Hartmann
195812c634 QmlDesigner: Use highlight blue for expression indicator
Using optipng on all PNGs.

Change-Id: Id43868b917b450b2b613ea309f105be282161c04
Task-numbner: QDS-540
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-04-03 14:09:29 +00:00
Alessandro Portale
65525a8001 Scroll Qt Quick Application Wizard: Enable minimal Qt version selection
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 52f95bae8b and
caused QTCREATORBUG-22245.

Task-number: QTCREATORBUG-22245
Change-Id: If4d2f384a28bf3dd130b097022ea6d8d30ef7509
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-04-03 05:40:55 +00:00
Eike Ziller
ac24380c34 Merge remote-tracking branch 'origin/4.8' into 4.9
Change-Id: I90a3c1d29fccc4290311237d8680eaddb3cb5915
2019-04-02 14:53:16 +02:00
Robert Loehning
5ca9ac4777 Fix wrong German translations
Change-Id: I9f932f1df93d723d5dc38bcee4f6ad6a4c653a7f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-04-02 11:43:06 +00:00
Eike Ziller
b5e7522237 Merge remote-tracking branch 'origin/4.9'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
2019-04-02 12:22:48 +02:00
Alessandro Portale
904ad4763f SharedContent: Update share.qbs
Change-Id: I07a3c5db37459c5bf1b6219a5d58f88e6346ca43
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-04-02 08:28:26 +00:00
hjk
ad889d6707 Debugger: Avoid looking up QList<QFileInfo> in QDir dumper
Task-number: QTCREATORBUG-22000
Change-Id: Ibb24dc81282118c1f6fe97af451647a54ffcc8dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-04-02 06:38:44 +00:00
Frederik Schwarzer
b767e9895f fix Gamepad import casing
Change-Id: Ifde9c018eb930dd80f520aa2c52ea26ab968a4bd
Fixes: QTCREATORBUG-22224
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-04-01 16:48:59 +00:00
Robert Loehning
f35532add8 German translation: an Stelle -> statt
Change-Id: Ib0385a9447b585c7c147c8471c829093d7ae4404
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@qt.io>
2019-04-01 10:55:09 +00:00
Thomas Hartmann
7249427749 QmlDesigner: Use QDS icon color for welcome mode
Change-Id: Icef4a2ba248b4205bedcf60f9c9de0d3cbdbfc75
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-04-01 10:19:43 +00:00
hjk
94d79ba3b5 Debugger: Fix "Break on Abort" with GDB > 8.1
GDB 8.1 changed behavior when specifying breakpoints, it now tries
to pattern-match function names, hitting e.g. 'Foo::abort()' for
'b ::abort'.

While the API exposes a way to opt-out of the new behavior there's
no way to tell when to do that other than trial-and-error.

Task-number: QTBUG-73993
Change-Id: Ied2e640e65e40df6eac50117db890bd4b51d36ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-04-01 09:28:04 +00:00
hjk
a89a885b2c Debugger: Fix "Load QML Stack"
There have been apparently changes on the Qt Declarative side.

Task-number: QTCREATORBUG-22209
Change-Id: Ia9e387aa92465556b5b8aee3661e2fc063478f3d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-03-29 15:04:35 +00:00
Robert Loehning
313bef3c47 Improve German translation for "on the GDB side"
Change-Id: Iae5c6aa5ff37c3d7b6d389a709f3d582d3be4e10
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-03-28 10:15:42 +00:00