Commit Graph

18 Commits

Author SHA1 Message Date
Eike Ziller
4cb04ad798 Merge remote-tracking branch 'origin/7.0'
Change-Id: If390b9264dba14c6c71752a0de84ab7ff881b2c5
2022-03-01 08:59:05 +01:00
Christian Kandeler
adf97c4b70 QbsProjectManager: Consider cpp.cFlags and cpp.cxxFlags
Amends 0dc87382e9.

Change-Id: Idb65fb3ab5a528c4cb2ad7a49a9ef02c0ab09dc7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-28 09:41:59 +00:00
hjk
e2cb64471a Utils: Move QtcProcess constructor setup data to shared setup data
This includes replacing DeviceProcess terminal handling with base
member.

Change-Id: Id1541bfce33c71dddc71b4816ad0b174dce3879c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-02-11 17:33:48 +00:00
Jarek Kobus
cd6d2b0cd8 Use QtcProcess in QbsSession
Change-Id: I1220bb533e4d7aa0577860b750a7d97e2139bc20
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-11-03 16:39:35 +00:00
Eike Ziller
5572bc7220 Merge remote-tracking branch 'origin/4.14'
Change-Id: Ie52e046f8e280e8c39f0cc5e9e710b4f885010a6
2020-12-17 13:10:44 +01:00
Eike Ziller
6a2a07d516 Qbs: Avoid popping up general messages pane
Except on direct user action. Use more evocative message manager API.

Task-number: QTCREATORBUG-24430
Change-Id: I44c6088904b2018baccb72cd3651e2ab62dc1358
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-17 11:22:54 +00:00
Raphaël Cotty
e8e2aa8c7f Android: fix debugging with qbs
If the default libs path doesn't exist (which is the case for qbs) then
try to get the abis using the current project node data method using
the Android::Constants::ANDROID_ABIS flag.

Because in multiplex (multi arch) mode dynamic libraries are compiled in
different products, library paths must be gathered from those
sibling products using the "dependencies" json array.

Change-Id: I9409a6a12fd9f304f427ed7868a7060c8f985a0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-15 15:39:44 +00:00
Eike Ziller
6477a07654 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangtools/virtualfilesystemoverlay.h
	src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildstepconfigwidget.ui
	src/plugins/qmldesigner/designercore/model/abstractview.cpp

Change-Id: I5013bd8fdd28d79cdea74380bec01d4c106adfaf
2020-08-31 14:49:19 +02:00
Christian Kandeler
151373396f QbsProjectManager: Fix install step
We got the install command name wrong, which caused the installation to
fail. In addition, we forgot to add handling for the "protocol-error"
message from qbs, so the step was hanging, rather than aborting.
Finally, we triggered a number of assertions in
BuildStep::buildConfiguration().
This went all unnoticed for a while, because the install step is not
enabled by default these days.

Change-Id: I906e7e472563d4ad8fc7557bd706a7cb67f9f2ba
Reviewed-by: hjk <hjk@qt.io>
2020-08-27 09:38:55 +00:00
Robert Loehning
64a641ec6a Use IDE_DISPLAY_NAME
Change-Id: If8ae9399a40a460b535faeec2320d1450e5099c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-03 09:13:52 +00:00
Christian Kandeler
7fad01eb02 QbsProjectManager: Consider cpp.distributionIncludePaths
... and pass them to the code model.

Fixes: QTCREATORBUG-24162
Change-Id: I4f33bba659fca957c56f2fcb4b8adce28533074b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-06-26 09:00:32 +00:00
Leena Miettinen
5290660932 Qbs: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I33dd13019dfd73912b10abd05e95f257fa52e8e0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-11 12:00:23 +00:00
Christian Kandeler
233c438a2d QbsProjectManager: Consider cpp.platformDefines for the code model
Fixes: QTCREATORBUG-19537
Change-Id: Ia51441491913da0f7b31c2ff02e2552ff58147f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 08:47:11 +00:00
Christian Kandeler
faa56b1965 QbsProjectManager: Fix setting up extra compilers
There were a couple of typos breaking the functionality.
Also separate updating extra compilers and the code model.

Change-Id: Ie8f7bbf62d4b7817af3a26298401ad99c011b6e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-06 09:53:17 +00:00
Christian Kandeler
5d53dbd501 QbsProjectManager: Relax qbs API version check
We have recently bumped the API compatibility version in qbs master.
However, Qt Creator did not make use of the removed feature and can
therefore deal with the old and the new version.

Change-Id: I40b2d8c9ef16993617b346887d4de5a936e8ec54
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-01-23 16:37:10 +00:00
hjk
0334b6e491 ProjectManager: Add convenience Task subclasses
For Compile, BuildSystem and Deployment. Unclutters user code and reduces
binary size.

Change-Id: Ia18e917bb411754162e9f4ec6056d752a020bb50
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-01-20 10:11:59 +00:00
Christian Kandeler
2225387b40 QbsProjectManager: Do not try to call qbs if there is no executable
Otherwise, we'll get warnings from QProcess.

Change-Id: Ibaa536729fa644583c8ddc7a2931ac0ee11c0c9e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-12-18 09:39:07 +00:00
Christian Kandeler
6913947986 QbsProjectManager: Switch to an out-of-process approach
That is, do not link to the qbscore library anymore. Instead, use the
JSON-based API.
Advantages:
    - We can build Qt Creator with qbs support without qbs being present
      on the build machine.
    - Smaller memory footprint for Qt Creator, as the qbs build graphs
      are now being managed by a separate process.
    - Potential crashes in qbs will not kill the Qt Creator process.

Fixes: QTCREATORBUG-20622
Task-number: QTCREATORBUG-22904
Change-Id: If7d344b0ac65a99ff0a3a3db215d61b8d903e47e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-11-21 13:32:18 +00:00