aboutsummaryrefslogtreecommitdiffstats
path: root/src/shared
Commit message (Collapse)AuthorAgeFilesLines
* Apply modernize-loop-convert fix-itIvan Komissarov2019-05-211-4/+4
| | | | | | | Makes clang-tidy happier Change-Id: Ic29b552572719ea58c7ad385cc6e1d68cef9eedc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Apply modernize-use-auto fix-itIvan Komissarov2019-05-201-10/+10
| | | | | | | | Makes clang-tidy happier Change-Id: I75f3b6409b425b9a7054d7886ab0160a040b25d5 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Return initializer list where it is possibleDenis Shienkov2019-02-261-30/+30
| | | | | | | | | This fixes this clang-tidy warning: warning: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list] Change-Id: I421e1e47462fe0e97788672684d47943af7df850 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Replace 'typedef' with 'using' where it is possibleDenis Shienkov2019-02-232-30/+30
| | | | | | | | One exception is that the 'typedef' for function pointers were skipped due to an additional work is required. Change-Id: I2112fded3abeaee1d1f49f56adfd2914d5db0324 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use 'const auto' keywords more at objects allocationsDenis Shienkov2019-02-231-4/+4
| | | | | | Change-Id: I592d433e7c473ae9f27ca08e701516efe53650ba Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge 1.12 into masterChristian Kandeler2018-11-121-0/+2
|\ | | | | | | Change-Id: I0efa484c5010607150e65d9401a0a30781c8c1fb
| * Fix qbs buildChristian Kandeler2018-11-121-0/+2
| | | | | | | | | | | | | | Don't try to bundle libraries of Qt modules that don't have any. Change-Id: I160d5b030db5ecbfa1b8eebb3babdc6ec7f41883 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Fix qbs buildChristian Kandeler2018-10-311-1/+2
| | | | | | | | | | | | | | Was broken by 38c897a0d4. Change-Id: Id02551fa9e7424075c5a708c3c06a3ce2be5f0e9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix bundledqt module for the bundled-QtScript caseJoerg Bornemann2018-07-121-0/+2
|/ | | | | | | | The Qt.script module is not present if the QtScript submodule is used. We must check that in the library collecting code. Change-Id: I7e9aaa5ac3ae546867cd93948653bc42f300429b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update the QtScript submoduleJoerg Bornemann2018-04-201-0/+0
| | | | | Change-Id: I5ab1e50c6010ee65c3e676a9825175484e1212ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add QtScript git submoduleJoerg Bornemann2018-04-092-1/+2
| | | | | | | | | | | | | | | This adds QtScript as a git submodule to build the qbsscriptengine library. QtDeclarative support has been stripped out. We don't need that. Windows CE and Symbian platform support has been removed. JIT has been disabled, which improves resolve/rule execution by 8%. [ChangeLog] Bundled QtScript as a submodule. Task-number: QBS-913 Change-Id: Idfbaf06eb2cef3985e5eae955f231686499f7754 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Build qbs with C++14Christian Kandeler2018-02-151-1/+1
| | | | | | | | | This will enable us to simplify some of our templates. Qt Creator requires C++14 as well, so we won't break it. Change-Id: I577347ef12c53ff2ec59e88344ff181b27a0d50c Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge 1.11 into masterChristian Kandeler2018-02-021-1/+2
|\ | | | | | | Change-Id: Id4986b2170ac13bf8931656659f6f60432cdbe8d
| * qbs build: Make the Qt bundling functionality configurableChristian Kandeler2018-01-301-1/+2
| | | | | | | | | | | | | | We don't want that in Qt Creator. Change-Id: I811eed24fae6cb3f652a89d37138d8cf00992057 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Use 'auto' keywords more for the allocated variablesDenis Shienkov2018-01-231-4/+4
|/ | | | | Change-Id: I25ec97e64522d7fa486fcf408d8134cbbd8b24ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Move the Qt library installation out of the archive productJake Petroules2018-01-082-0/+79
| | | | | | | | | | | | | | | | | | | | | | This allows Qt to be installed as part of Qbs by default instead of only when the archive package is built. Currently, this is enabled by default only for installations of Qt on macOS which are relocatable (have rpath in QT_CONFIG). This way it will not interfere with package managers like Homebrew/MacPorts which do not use rpath - for example, when building against a version of Qt installed by a package manager (which is typically built with absolute sonames), you're assumed to be building software to be packaged by that package manager, and therefore you want to rely on Qt as a "system" package and not copy it locally. It can also be explicitly switched off on the command line using products.qbsqt.deployQt:false This also refactors the logic a bit. Change-Id: I70b46d8fac08d34520ceab18405fa8a672158711 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Modernize variable declarationsDenis Shienkov2017-11-301-6/+6
| | | | | | | | Use 'const' and 'auto' keywords more where static_cast is used. Change-Id: I60152b90fe5e44aa1ca513b43f133e604ed6417f Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* Use nullptr to initialize the pointersDenis Shienkov2017-11-201-18/+18
| | | | | | Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use qbsjson in the VisualStudioGuidPool implementationJake Petroules2017-09-111-0/+1
| | | | | Change-Id: Ie19b7c06e77af22a639395338cb051095bd3db84 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add a copy of qtcjsonJake Petroules2017-09-085-0/+5573
Will be used in a subsequent patch. Change-Id: Iba048462a733051dffe77b48cbcd2db26468e2d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>