summaryrefslogtreecommitdiffstats
path: root/src/corelib/.prev_configure.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Remove old configure-related filesJoerg Bornemann2021-06-181-991/+0
| | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: Ie827562f7fd2513d59f69234d77b8b93124ea78e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QLatin1String: optimize indexOfMårten Nordheim2021-06-111-0/+26
| | | | | | | | | | Some time ago I wanted to use QStringTokenizer with a QL1S haystack and needle to optimize a particular bottleneck. Only to realize the new bottleneck was more expensive (continuously converting both the strings to QString). Change-Id: Ica86db0043c839c2336a3c3886ffbe3875659b5b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* CMake: Regenerate stale prev_configure.cmake filesAlexandru Croitor2021-03-311-0/+8
| | | | | Change-Id: I75d7f2f3d9b40ad392bb598b466fec4708b51a61 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge "Fix build of Core module without regularexpression feature"Alexey Edelev2021-03-041-1/+1
|\
| * Fix build of Core module without regularexpression featureAlexey Edelev2021-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qregularexpression.h requires FEATURE_regularexpression to be enabled. Add a condition to the 'qt_pch.h' header to fix the build when PCH are enabled and FEATURE_regularexpression is disabled. It seems that the filter implementation of QSortFilterProxyModel has QRegularExpression as its base. It's necessary to make sortfilterproxymodel dependent on the regularexpression feature. Fix the precompiler condition for the extractSections function in the QString implementation. Use the same precompiler condition for the QString::section and extractSections functions, since QString::section depends on extractSections. Change-Id: I5b775e0842a0aa1a8d47f8dded376bdfcf63b5bf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove win32_system_libs feature from src/corelib/configure.jsonJoerg Bornemann2021-03-041-4/+0
|/ | | | | | | | | | | | This feature only existed to trigger the evaluation of the libs gdi32, kernel32 and friends. Those libs only were relevant for the qmake build of Qt and can be removed now. Task-number: QTBUG-83932 Change-Id: Idfd4d8f70b6dbd1067412fecc1115b504b1ad347 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Use newlines more consistently in generate compile-test codeEdward Welbourne2021-02-151-39/+21
| | | | | | | | | | | The generated code contained many repeated blank lines. Most main()s were preceded by one, but not all. Only include blank lines for actual empty entries in lists, where configure.json specified them, plus one before main if anything else precedes it. Change-Id: I6e6c34940e08712a1aa848a3c9ad1b0fb5806d77 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Simplify test-snippets in configure.cmakeEdward Welbourne2021-02-151-46/+23
| | | | | | | | | The main(void) signature obviates the need for unused parameters and has existed since (at least) C89; so use that instead of the old-fashioned argc/argv arguments we don't use in any of these tests. Change-Id: Ibfe850a1fce378673c9781011475ea623fd75ad4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update two .prev_configure.cmake files that seem to be out of dateEdward Welbourne2021-02-151-1/+1
| | | | | | | | Running the script updated them, without updating the configure.cmake files they relate to. Change-Id: I050d2131fa575811ae9ff4b51ef786a073c554c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix pcre2 feature conditionsJoerg Bornemann2020-11-091-2/+2
| | | | | | | | | | | The pcre2 feature was turned off when the user passed -system-pcre to configure. The reason were faulty expressions in the enable/disable fields. Fixes: QTBUG-88295 Pick-to: 5.15 Change-Id: I4edee49a9c797797ef3b80f955b48b5492fb4fc7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Regenerate configure.cmake filesAlexandru Croitor2020-09-281-1/+1
| | | | | Change-Id: I165c633d7c052fb80419d4b2c57561de40217ade Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make usage of forkfd_pidfd in QProcess a configurable featureAlexandru Croitor2020-09-171-0/+8
| | | | | | | | | | | | | | | | | | | Our CI cross-compiling arm qemu builds have issues in tests that use QProcess, due to user-space qemu seemingly not supporting pidfds properly. Add a 'forkfd_pidfd' configure.json feature, which can be manually disabled when configuring Qt, causing QProcess to do a regular fork instead of using the new pidfd kernel feature. This will help us avoid the regression of multiple tests failing on the new Ubuntu 20.04 CI host images when they are run via qemu. Task-number: QTBUG-86285 Task-number: QTBUG-86187 Task-number: QTBUG-86198 Change-Id: Ib2209d7e95126e0fb738bf59e39070d5a62c482f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move QStateMachine from QtCore to QtScxmlKarsten Heimrich2020-08-241-11/+0
| | | | | | Task-number: QTBUG-80316 Change-Id: I2ee74110fd55e94d86321d3b3dc5bb8297424ed4 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Configure.json: Do not link to pthread on Android on feature testingCristian Adam2020-08-121-0/+1005
pthread has been removed from the NDK and the cxx11_feature detection fails. Fixes: QTBUG-72330 Change-Id: I22a97814b7e95011ad3944327f02343348c72b91 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 23:10:44 +0000