Commit Graph

9 Commits

Author SHA1 Message Date
Christian Kandeler
0edcbd8853 CPlusPlus: Always build the tools
There is no advantage to excluding the tools by default that outweighs
the risk for them to get out of sync with the rest of the codebase.

Change-Id: I3ad292aa5648a4448babdf5d06c84b3f5ec94482
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-09 13:46:50 +00:00
Eike Ziller
5c87432260 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
2016-04-12 11:34:46 +02:00
Orgad Shaneh
8dadafb9e0 Revert "Qbs: Replace deprecated qbs.getEnv with Environment.getEnv"
We still need to support qbs 1.4.

This reverts commit 7c8744e6cd.

Change-Id: Ic8207a4994ec59665374a94bd8ee921b067856db
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-04-12 07:40:04 +00:00
Orgad Shaneh
7c8744e6cd Qbs: Replace deprecated qbs.getEnv with Environment.getEnv
Change-Id: Iebca0ae87bc3dee65fbc0f16c3c7f6f8afc0fead
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-04-11 19:33:42 +00:00
Nikolai Kosjar
309da0b475 C++: Move cplusplus-keywordgen into src/tools/3rdparty
Change-Id: I9a669497d4ec5db6ade270c272bf52a365cfc7fe
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-07 08:36:51 +00:00
Oswald Buddenhagen
e426d08e54 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
2016-04-01 17:31:39 +02:00
Nikolai Kosjar
be32cdc670 C++: Import roberto's kwgen utility
...as src/tools/cplusplus-keywordgen so it will not get lost. Taken from
[1] in its current revision (e7831d6).

The utility generates code that classifies identifers/keywords. Most
probably the following files from Qt Creator were generated by it or are
at least based on its output:

 src/libs/3rdparty/cplusplus/Keywords.cpp
 src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp
 src/libs/glsl/glslkeywords.cpp
 src/plugins/cpptools/cppdoxygen.cpp

We will use the utility to update the known qdoc/doxygen keywords. The
clang code model will also profits from this.

[1] https://github.com/robertoraggi/cplusplus/blob/master/tools/kwgen.cpp

Change-Id: I604f2028d32fd9a48bd6f84bef7264b6d2beed7d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-03-31 11:45:31 +00:00
Christian Kandeler
0bbd8a85d3 Fix project resolving with qbs master.
Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-03-22 14:00:51 +00:00
Nikolai Kosjar
ba20d638cf C++: Add cplusplus tools to qtcreator.qbs
Change-Id: I19e31ec13a6f726eff5938bca191c251abb50b4d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-30 09:56:39 +00:00