Eike Ziller
eadfe1a421
Merge remote-tracking branch 'origin/4.11'
...
Change-Id: Iaa3142a7109bc23c2e6ff96d061a58a9c0e31a54
2020-02-07 16:20:03 +01:00
Leena Miettinen
13cd5add85
Doc: Fix errors in QrcParser and QrcCache docs
...
Task-number: QTCREATORBUG-23544
Change-Id: Ibd3bdd0b1aecf594b191b2ff902b38cdb335b1d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io >
2020-02-07 14:28:02 +00:00
Eike Ziller
0795a5ae6f
Merge remote-tracking branch 'origin/4.11'
...
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
2020-02-07 10:41:09 +01:00
Leena Miettinen
392690e565
Doc: Fix Utils::QrcCache and Utils::QrcParser docs
...
- Move class docs away from the internal namespace
- Add missing docs
- Remove \brief commands and fix capitalization and punctuation
Task-number: QTCREATORBUG-23544
Change-Id: I60440a603e73c78447fd4d923d8631debeb25116
Reviewed-by: hjk <hjk@qt.io >
2020-02-07 07:35:30 +00:00
Alessandro Portale
9904464074
Make various Q_LOGGING_CATEGORY's static
...
Change-Id: I43d3a198b0863d85a7fb305c7cb768f68acbd139
Reviewed-by: hjk <hjk@qt.io >
2020-01-15 14:54:10 +00:00
hjk
2e14df7561
Some clang-tidy -use-modernize-nullptr
...
Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io >
2019-08-01 13:20:26 +00:00
hjk
06e3e23aa5
Utils: Replace a few macros in qrcparser
...
Change-Id: I8e3953ad7003115334a490d6ebf8222414722e85
Reviewed-by: Christian Stenger <christian.stenger@qt.io >
2019-03-19 14:27:17 +00:00
Christian Kandeler
2f7f1aaec3
Move qrc parser from QmlJS to Utils
...
We'd like to make use of it in a more general context, and it's not
directly related to QML.
Change-Id: I025ec67829f85544667684cdb8c99d1ee4c18197
Reviewed-by: Eike Ziller <eike.ziller@qt.io >
2019-02-13 11:48:27 +00:00
