qt-creator

feedc0de/qt-creator

Fork 0

forked from qt-creator/qt-creator

Commit Graph

Author	SHA1	Message	Date
Joerg Bornemann	cabbeb1c54	Synchronize autotest defines in qmake and qbs build Do not remove QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION in QtcAutotest, but in the two tests that won't build with it. In the qmake build the defines are not removed from json.pro, because this file does not include qttest.pri. Change-Id: I97d173528ca2a02bac1bfae30709a959e6b69375 Reviewed-by: Christian Stenger <christian.stenger@qt.io>	2018-03-19 11:50:38 +00:00
Christian Kandeler	8b8a32ba0e	qbs build: Do not access the bundle module unconditionally We should not rely on its presence on non-Darwin platforms. Change-Id: I3fa722038f9c2d1139f6e1dc8c49d1c4d2fe0bee Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>	2017-08-03 11:09:55 +00:00
hjk	b8a8fe34a2	Introduce a Qt-free JSON implementation This is essentially QJson with Qt replaced by std:: features. This is useful to have in circumstances where a Qt dependency is undesirable, e.g. for the Qt Creator debugger protocol implementation in our CDB extension. Change-Id: Iec79c6b23b1e717ce1b6f4d38755287d1f479c13 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>	2015-11-09 08:25:11 +00:00

Author

SHA1

Message

Date

Joerg Bornemann

cabbeb1c54

Synchronize autotest defines in qmake and qbs build

Do not remove QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION
in QtcAutotest, but in the two tests that won't build with it.

In the qmake build the defines are not removed from json.pro, because
this file does not include qttest.pri.

Change-Id: I97d173528ca2a02bac1bfae30709a959e6b69375
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

2018-03-19 11:50:38 +00:00

Christian Kandeler

8b8a32ba0e

qbs build: Do not access the bundle module unconditionally

We should not rely on its presence on non-Darwin platforms.

Change-Id: I3fa722038f9c2d1139f6e1dc8c49d1c4d2fe0bee
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2017-08-03 11:09:55 +00:00

hjk

b8a8fe34a2

Introduce a Qt-free JSON implementation

This is essentially QJson with Qt replaced by std:: features.

This is useful to have in circumstances where a Qt dependency
is undesirable, e.g. for the Qt Creator debugger protocol
implementation in our CDB extension.

Change-Id: Iec79c6b23b1e717ce1b6f4d38755287d1f479c13
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

2015-11-09 08:25:11 +00:00

3 Commits