Commit Graph

12 Commits

Author SHA1 Message Date
Eike Ziller
829a08047f Merge remote-tracking branch 'origin/4.9'
Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628
2019-05-17 12:47:24 +02: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
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
Tobias Hunger
aa37df645d JsonWizard: Update to use supportedProjectType
Remove "kind" as that is no longer necessary (even though it is still
handled if that is in the wizard).

Change-Id: I3e56d5e0d936b622dae5091950427f9b2db60695
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:20:55 +00:00
Tobias Hunger
f1f2475d3e JsonWizard: split plugins and features when considering enabled state
Now that we have the infrastructure to handle both separately it makes
no more sense to merge them.

Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:50:24 +00:00
Tobias Hunger
d7b70000ac JsonWizards: Move .gitignore template file
Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 14:11:35 +00:00
Tobias Hunger
5d63c06e75 Empty Qmake project wizard: Make .gitignore work again
Change-Id: I590a88c4c66a0dbc879d2ba9198f273333fa35e5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-15 15:42:31 +00:00
Tobias Hunger
8211e6a084 JsonWizard: Simplify handling of bools via JS
Change-Id: I5381e83f6714886b7bf8cbcb859e1dd3b115a6c3
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-11 13:33:10 +00:00
Tobias Hunger
6c49356471 JsonWizard: Allow for descriptions of wizards
Allow for descriptions of project wizards that will be displayed in the
Project location page.

Task-number: QTCREATORBUG-13924
Change-Id: I7d65aba0e07f074cc0935318cff9b93f166a1c51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-24 14:56:21 +00:00
Tobias Hunger
6a338d73ba JsonWizard: Add .gitignore file to empty qmake projects
Task-number: QTCREATORBUG-3125
Change-Id: I8c6777734224d4f7fff27ce441f75f380460723a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-10 16:29:10 +01:00
Tobias Hunger
3cc6ca1286 JsonWizard: Rename Kits page to make it consistent with other wizards
Change-Id: Ie3bcd79cf402c0dbed8a6f616c730a7c59a907d2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-04 11:00:24 +01:00
Tobias Hunger
86d7a980ff JsonWizard: Replace EmptyProjectWizard with a JsonWizard
Change-Id: Ia199a04b535535722a3b47a9651b16635b019cbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 09:44:24 +01:00