Commit Graph

746 Commits

Author SHA1 Message Date
BogDan Vatra
e3904f3b13 CMake: Add Android Multi ABI support
Change-Id: Ia5b3fcda29705fefca85833ebc28b4154defba5f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-10-28 05:47:53 +00:00
Eike Ziller
fcb12a275f Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/projectexplorer/deploymentdata.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I64c304fc71435629a6a0060a9df71e8952699508
2019-10-16 15:27:22 +02:00
Mariana Meireles
26cb6994c4 Corrects the project type supported
Change-Id: I9434ed86d4d20e44abbe2cd07f9a7d838a53761a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-10 10:26:24 +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
Eike Ziller
8263f73a4a Merge remote-tracking branch 'origin/4.10' into 4.11
Change-Id: Iad66b08f8d6d7f14319674ae6bb26cdba43b3bfa
2019-09-26 14:59:33 +02:00
Christian Kandeler
ca1cee0956 Wizards: Fix JSON file template for Qt Creator plugin
As of commit aaa8beab88, template files for XML wizards go through
Utils::TemplateEngine::processText and thus need to have their
backlashes escaped.

Fixes: QTCREATORBUG-22945
Change-Id: I33aaa73b66be065f0ba3ed9b45cb8c9558f70d31
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-25 08:31:25 +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
Tobias Hunger
dac42e9e28 Wizards: Fix JSON of qtquick2-extension wizard
"\." is an invalid backslash escape sequence in JSON. QJSON accepts
this though and silently "fixes" the string by removing the stray
'\' character. This is QTBUG-78443 now, as a conforming JSON parser
should reject invalid data.

The string as "fixed" by QJSON is also not what we wanted in the
first place.

Change-Id: I070999957c6a0c3d0f1753d907ac460e9e341fc1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-17 09:30:55 +00:00
Tobias Hunger
2751f30c72 Wizards: Use valid Json only
The original version is not valid JSON, even though the QJSON parser
will accept it:-/

Change-Id: Id408e4b83a62bca358191cf6fe4b3a7ce7d7c59e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-17 09:30:46 +00:00
BogDan Vatra
6b31f9cf23 Android multi arch support
[ChangeLog][Android] Android multi arch support for qmake

Change-Id: Ib8b1874604a3392130c96fbc00b26713b3d788ae
Reviewed-by: hjk <hjk@qt.io>
2019-09-16 07:34:54 +00:00
Christian Stenger
90189ec3d1 AutoTest: Wizard: Soften condition for gtest repository
Make the need for the googletest repository optional. The user
may have gtest installed inside the system instead.

Change-Id: I4959878fa893d6b8ed53fd612934d7cd4504a6b7
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-12 08:50:36 +00:00
Eike Ziller
6c9f75ff4a Transform Qt Quick 2 Extension Plugin wizard to JSON
Change-Id: I0e59219adeb5b3aa08a99da7c0bb657d793ba2e1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-28 16:38:23 +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 Kandeler
df8ef72aec Wizards: Do some input validation on repository URLs
Fixes: QTCREATORBUG-18935
Change-Id: Ie2103cbe2899ea23caaedd4a6350c78b5f380ab9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-07-26 10:41:03 +00:00
Alessandro Portale
16a2241e7d Import wizards: Visually improve the selected state of icons
This change adds a thin gray outline to the cvs, git and qmake/generic
import wizard icons. In the selected state, they should now have a
better visual contrast.

Task-number: QTCREATORBUG-18936
Change-Id: I2a0f5dab74cdc5958f869a63756a4fc974ccad32
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-07-25 13:16:20 +00:00
Christian Kandeler
6a50abe34f Wizards: Remove "public slots:" segment from class template
Slots have become rather irrelevant with Qt5 and C++11. Let's not annoy
and/or confuse users by reserving a segment for them in our generated
classes.

Change-Id: Ied26bd627c87654ac26f6577387397f39367c0ee
Reviewed-by: hjk <hjk@qt.io>
2019-07-24 15:28:19 +00:00
Christian Kandeler
46ef3f3027 "New class" wizard: Respect the project's "no Qt keywords" setting
Fixes: QTCREATORBUG-6812
Change-Id: I3f51c61f7a1ed1e4626be6bc31fa2e3affed2084
Reviewed-by: hjk <hjk@qt.io>
2019-07-22 15:43:19 +00:00
Eike Ziller
4ce34fd90f Merge remote-tracking branch 'origin/4.10'
Change-Id: I88a6704fb8d723a3cbdfb1a2d9c84741f30d4da6
2019-07-22 09:34:47 +02:00
Christian Kandeler
c8e656c506 Add qbs support to library wizard
Change-Id: Id78bc547cf42dec8948d7ebca56eacfcbbd2f055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-18 12:36:43 +00:00
Robert Loehning
5ce028c499 Fix capitalization of "qmake"
Shall be consistent with other wizards

Change-Id: I810cf55abf519f5b67155063ce515c4442fc6637
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-18 10:09:18 +00:00
Eike Ziller
f689f86be5 Merge remote-tracking branch 'origin/4.10'
Change-Id: I1193e94353c14492a9e7f093fbcd3fa53f83e390
2019-07-18 07:30:29 +02:00
David Schulz
3213e12ce7 rename PythonEditor plugin to Python
The plugin does not only contain a pure editor, but all kind of support
for a programming language like project and run support.

Change-Id: I1251367c8db2e7a54986415ffc5b860cb210de3c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-17 06:21:23 +00:00
Eike Ziller
178e57129d Fix imports in Qt Quick wizards
Fix-up of e0d38ae414

Change-Id: I9f4055647bbf82c89b3282048944bc6ac89faacf
Fixes: QTCREATORBUG-22614
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-07-16 13:00:59 +00:00
Alessandro Portale
663e9003a3 Application wizards: Remove duplicate entry in a generated .qrc file
qml.qrc: Warning: potential duplicate alias detected: 'main.qml'

Change-Id: I949fda863175c3de4a828a93ca01620010a44e93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-15 05:38:12 +00:00
Tim Jenssen
1df6443d4a Merge remote-tracking branch 'origin/4.10'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/synchronousprocess.cpp
	src/plugins/baremetal/iarewtoolchain.cpp
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	tests/unit/unittest/CMakeLists.txt

Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
2019-07-04 15:17:55 +02:00
Christian Stenger
f643f87793 Wizards: Fix typo in Plain C++ wizard
Change-Id: Ifbef31b7edded3f372debe3065fe4e9abc4e9455
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-07-04 07:39:17 +00:00
Christian Kandeler
dfb6fbed7c "New Class" wizard: Add option for adding the Q_OBJECT macro
This lets users specify that a class derived from a custom base should
have a Q_OBJECT macro, and it also allows them to opt out of it for
classes derived directly from QObject & friends.

Fixes: QTCREATORBUG-21810
Change-Id: I850bd3bcb7b6eb71720afe5fa097178ff5d5c620
Reviewed-by: hjk <hjk@qt.io>
2019-07-01 15:19:18 +00:00
Eike Ziller
10098b2508 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	CMakeLists.txt
	tests/unit/unittest/unittest.pro

Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
2019-06-28 12:50:03 +02:00
Christian Kandeler
375ec4c51b Wizards: Fix qbs project template for QtQuick app
Change-Id: Iffc9dad352d78f54557f45b36687c543935853dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-27 09:00:35 +00:00
Christian Stenger
6288e03264 Wizards: Fix regular expressions
Although this is valid JavaScript matching the '.' is
not working as expected.
The directory always gets messed up by replacing the
first character with a dash. Use an alternate regular
expression and also ensure the replacement happens
globally instead of once as we want to replace all
dots by a dash.
As at it fix handling of the file suffixes as well.

Task-number: QTCREATORBUG-22625
Change-Id: Ide189fe50e29994abfb368e503050b9b413aba9f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-27 07:18:19 +00:00
Christian Kandeler
019447c535 New class wizard: Add Qt module dependencies, if necessary
Provide general infrastrucure and implementation for qmake.

Fixes: QTCREATORBUG-16067
Change-Id: I8c6368fe2724c9450dcbc3410b6ca459bbbdc043
Reviewed-by: hjk <hjk@qt.io>
2019-06-19 14:06:49 +00:00
Cristian Adam
36135aa261 CMake: Small clean-up of CMake Wizards
* Updated CMake minimum version to 3.5 (Ubuntu LTS 16.04)
* Lowercase commands
* Used the target name instead of ${PROJECT_NAME}, which nobody uses in practice
* No string quotes around the source filenames, which do not contain spaces

Change-Id: Ide9b3eb85535213798c6c35e08624cae080ebd9d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-12 13:34:58 +00:00
Christian Kandeler
a093dfc65c Wizards: Include namespace in header guards again
This was broken in 63c339ffba while trying to fix a different bug.

Fixes: QTCREATORBUG-18157
Change-Id: Iec7e14de257195ed9bb20314b8031d3ef59df2ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 11:05:12 +00:00
Christian Stenger
884665a0fe Wizards: Fix CppLibrary wizards
Fix wrong string evaluation of boolean values which made
in turn the generated files partially wrong.
Introduced with cb63706f83 (but wrong also before for
the no-Qt-dependency case).

Change-Id: I404534d4b21d0d1c496635adfcd8a73716ba13d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-03 11:08:37 +00:00
Eike Ziller
23c222f61b Fix C++ Library wizard when compiled with Qt < 5.12
Only Qt 5.12 got true ECMA Script capabilities, so arrow function
expressions are not supported before that.

To be able to use "regular" inline functions, we allow usage of } by escaping with backslash.
For variables that do not start with "JS:" we already supported backslash for escaping.

Fixes: QTCREATORBUG-22336
Change-Id: I9fc638e64d2757a21fffc16355635e2fcff87a36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-03 06:46:52 +00:00
Christian Stenger
84b34a41e7 Wizard: Make the default generated template runnable
If one uses the Python - Window template and does not explicitly
change the custom base class to an existing the generated project
lacks some essential stuff.
Make the generated main file usable even for first time users.

Change-Id: I898189fd4edff88f13987d6d1df9f77e2ef6bd68
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2019-05-27 11:35:37 +00:00
Christian Stenger
675ac662e9 Wizard: Fix AutoTest wizard for Boost with CMake
While at it use the same environment variable used for
Qmake or Qbs based project.

Change-Id: Ieefb4e1da4ce4155863b80a1b275b67e664273c6
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-24 06:58:41 +00:00
Christian Stenger
5c6eb0a2ba AutoTest: Further adaption following official terms
GoogleTest started using the term Test Suite for grouping
related tests and Test Case for general tests.
This patch adapts the visual strings as well as some
internal API which used the same terms.
This completes 6189745a3b.

Change-Id: I0307c10b8b5f8574f31a68ee4320732f3e829532
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-24 06:24:44 +00:00
Christian Stenger
a0b94384a6 AutoTest: Add wizard for Boost test
Task-number: QTCREATORBUG-21169
Change-Id: I77936e3e47911cf724705c858b9897c74875c41e
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-05-23 12:19:36 +00:00
Christian Kandeler
068dbd3aef Wizards: Take Qt virtual keyboard setting into account
... in the project files.

Fixes: QTCREATORBUG-22446
Change-Id: I39f8d6be17ac9fb8f41dd91851578e34c249bfe3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-05-21 14:40:52 +00:00
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
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
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
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