summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* configure: Remove unused facility to define variable assignmentsJoerg Bornemann2022-02-151-7/+1
| | | | | | | | | | | | | | The function qt_commandline_assignment and everything related to it is removed from configure. It was only used in qtbase, and all usage has been removed. More general variable assignments will be added in a subsequent commit. Task-number: QTBUG-88210 Change-Id: I7cfa782e89914f2b0dc0277c46e425c8a825557e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 6ab16d52d282b1a370cda3f0cf0827142250ac29) Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Bump version to 6.2.4Jani Heikkinen2022-01-281-1/+1
| | | | | Change-Id: If50449d62b2a0dbdc01504b90ffb26fa2b8d992e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Properly wait for the Android emulator to fully bootDimitrios Apostolou2022-01-071-34/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It had been noticed that sometimes the Android emulator in our CI took several minutes to fully boot. It turns out that this behavior can be reproduced locally by removing the image files under $HOME/.android especially the "userdata-qemu.img.qcow2" file. Then the emulator goes through several reboots until fully booted with a full set of packages installed. We discovered that the property that signifies it is finished is dev.bootcomplete=1. So we now check for this flag and remove the other heuristics we had. We also disable the debug output to avoid hundreds lines of logs. Instead we selectively print the values that the emulator returns, every second until full boot is detected. We increase the Coin timeout for the shell script, from 5min to 10min, since it has been measured that it takes about 2.5min on a good day, and the script itself retries several times to restart the emulator in case of failure. Finally we adjust the coding style a bit to be more consistent. Fixes: QTQAINFRA-4681 Change-Id: I77062dceb91477e957696c89bfacb4ebabc34c1f Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 98f1034f96edbd7e7e88a513f8549259fd07c35b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Wait for boot to be fully complete with all packages installedDimitrios Apostolou2022-01-061-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | It happens that the android emulator supposedly "finishes" booting and getprop shows bootanim=stopped and boot_completed=1. But sometimes not all packages have been installed (`pm list packages` shows only 16 packages installed). After around half a minute the boot animation starts spinning (bootanim=running) again despite boot_completed=1 all the time. After some minutes the boot animation stops again and the list of packages contains 80 packages, among which is also the "development" package. Only then is the device ready for `adb install` of custom packages. This should be the last time we see the message: Error: Could not access the Package Manager. Is the system running? Just for completeness, we also properly disown the emulator process and its file descriptors, since the parent shell dies but the process stays. Fixes: QTQAINFRA-4681 Change-Id: I2b9d4bdc3dac0f10d09d4f09c83b4028ebc31f48 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit c8e0a742fb316cf266ec6d56b9b702f07557e2e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not hide android emulator outputDimitrios Apostolou2022-01-061-1/+4
| | | | | | | | | | | | | | It might print useful messages, even though they might come mixed with other test messages. However we can't leave stdout/stderr as is, because Coin agent hangs at the end of the shell script, waiting for them to close. So we just redirect them to a file. Change-Id: I797af78786b7df31131b3c3261e1c1fc00e5d460 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 8bf1beb9bd4281626eb6740a69ccb7cb70e56ae7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Wait for android emulator to be up and running properlyDimitrios Apostolou2022-01-061-11/+41
| | | | | | | | Fixes: QTQAINFRA-4681 Change-Id: Icfa75b6982964970172726379e5a2a2bb640f8bf Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> (cherry picked from commit 0aaf51404272e0b16d0e670d469ece0730412c35) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.2.3Jani Heikkinen2021-12-141-1/+1
| | | | | Change-Id: Ieacae37b05e33210f60c0f5f58a1ae5513f401fb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* locale_database: Add entry for 'South Sudan Standard Time'Ievgenii Meshcheriakov2021-11-101-0/+1
| | | | | | | | | | | | This timezone is new in CLDR 40, Olson database calls it Africa/Juba. The offset is UTC+2. Reference: https://techcommunity.microsoft.com/t5/daylight-saving-time-time-zone/2021-time-zone-updates-for-republic-of-south-sudan-now-available/ba-p/2234981 Task-number: QTBUG-94358 Change-Id: Ib70dbd9b472eb9cf8cb62a0eb5e241199148c077 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (adapted from commit 2c505eea01d5c20ad1487d8009d2f3badcbc5201)
* Bump version to 6.2.2Jani Heikkinen2021-11-021-1/+1
| | | | | Change-Id: Ic14ce91b21948d1c6051a5476f74e0a8bbbf9080 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Rename deprecated ANDROID_SDK_HOME to ANDROID_SDK_ROOTAssam Boudjelthia2021-10-311-2/+2
| | | | | | | | Task-number: QTBUG-97002 Change-Id: I777491f542e5388e04ed4c1b7ff5d9db75f9e778 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit a81f24ada5cb125b2f19dc399b2c51dc7cd6ac99) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump version to 6.2.1Jani Heikkinen2021-10-041-1/+1
| | | | | Change-Id: Id00b56284fcf15350d5e9f41b22e7259afbe27a3 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* pro2cmake: Generate public CMake API code for projects by defaultAlexandru Croitor2021-09-271-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously pro2cmake assumed that all .pro were internal Qt projects like qtbase/src/corelib.pro and generated private api calls like qt_internal_add_module(). Public CMake API calls (like qt_add_executable) were only generated if an --is-example command line flag was passed to the script or if the .pro file was located under the examples subfolder of a qt repo source directory (indicated by the presence of a .qmake.conf file). Change the logic to always generate public CMake API code by default, unless a .cmake.conf/.qmake.conf file is encountered with a valid repo module version inside, in which case apply the old heuristic of checking for the ./examples subfolder. The intention is to have a sensible default so that Qt users can use the script to more easily migrate their qmake projects without having to explicitly specify the --is-example flag. Task-number: QTBUG-96799 Change-Id: I38f4f1b349a5b9688cf7bc5914d4fde72e660a98 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 96659297064ad0eb15f173a4452d349e8d43e2c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* pro2cmake: Augment searching of .qmake.conf with .cmake.confAlexandru Croitor2021-09-271-42/+58
| | | | | | | | | | | | | | | | | | | Adapt to fb656c036db0549180073e133773862d08f6cd24 which removes .qmake.conf files in repos by searching for either .qmake.conf or .cmake.conf. The locations of those files are only used to compute relative paths based on the directory where the conf file is. For now, remove the warning if a conf file is not found, because we intend to change the script to generate user project code by default, instead of Qt internal project code and the warning looks scary. Task-number: QTBUG-96799 Change-Id: I301e93d2ce5c05a52877eb6ed9eb9cee54fc5b15 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 124f7c681fd74f01aaa60dc31c26e51c52f2b1e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-241-1/+1
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Task-number: QTBUG-95018 Change-Id: Ieaf82c10987dd797d86a3fd4a986a67e72de486a Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 0da123d67b0fd332691f98ae6957ef05e9e20e84) Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* pro2cmake: Fix reported make flake8 issuesAlexandru Croitor2021-09-091-1/+0
| | | | | | | | | | pro2cmake.py:458:5: F841 local variable 'is_parent_path' is assigned to but never used Change-Id: I1c61efe5cf568fa0c99b07eed28b93d3444a5fac Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 8a66e3cfe56e3ec3e1567ecef77ddb6eba9e7238) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* pro2cmake: run make format to fix styling issuesAlexandru Croitor2021-09-094-27/+58
| | | | | | | Change-Id: I718e34d628576bb709096c0672da3a69b71ae8df Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 21a281d9622b22fa8bd6f731226eff8e5ee9802d) Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* pro2cmake.py: generate examples with properties in qt_add_executable()Oliver Eftevaag2021-09-081-5/+18
| | | | | | | | | | | | | | | | | This patch will slightly change the output of CMakeLists.txt files that are generated for examples. * set_target_properties() will no longer be added to the top-level scope. If the WIN32 and MACOSX_BUNDLE properties should be added, they will instead be added to qt_add_executable(). * The version in cmake_minimum_required() will now be 3.16, rather than 3.14. Change-Id: I79e1865dace5538d2b7ff264da02f9e28a655ae9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8337493301ae25e5afaa94777c0ee0d1e6503660) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Bump project versionsAlexandru Croitor2021-08-021-1/+1
| | | | | | Fixes: QTBUG-95454 Change-Id: I2467d3ae27b54424e59a7a4ab00d364eaec517d5 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* locale_database: Use context manager interface to update source filesIevgenii Meshcheriakov2021-07-203-129/+134
| | | | | | | | | | | | | Use context manager interface (with statement) to atomically update source files. This ensures that all files are properly closed and the temporary file is removed even in case of errors. Task-number: QTBUG-83488 Change-Id: I18cd96f1d03e467dea6212f6576a41e65f414ce1 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit e9519d207e3c38ca779f7dcfc5e5a716ec041590) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Use NamedTemporaryFile for temporary filesIevgenii Meshcheriakov2021-07-191-14/+7
| | | | | | | | | | | | Using NamedTemporaryFile instead mkstemp + fdopen simplifies the code. It also makes it easier to switch to using context managers for handling source file modification. Task-number: QTBUG-83488 Change-Id: Ibeae840ac6dde3d0b49cd7f985cfa6cd775b7f47 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 8f06d3f9383e4fe0926b5911cc64c52fa01e8c5e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Use pathlib to manipulate paths in Python codeIevgenii Meshcheriakov2021-07-195-65/+76
| | | | | | | | | | | | pathlib's API is more modern and easier to use than os.path. It also allows to distinguish between paths and other strings in type annotations. Task-number: QTBUG-83488 Change-Id: Ie6d9b4e35596f7f6befa4c9635f4a65ea3b20025 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 2d0c2c9f1cb4f1637b623a80312251326740f245) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Use argparse module to parse command line argumentsIevgenii Meshcheriakov2021-07-173-72/+71
| | | | | | | | | | | | arparse is the standard way to parse command line arguments in Python. It provides help and usage information for free and is easier to extend than a custom argument parser. Task-number: QTBUG-83488 Change-Id: I1e4c9cd914449e083d01932bc871ef10d26f0bc2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 5ef5dce53bb9f25b79275d1a2d7087b3eabfa792) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Use f-strings in Python codeIevgenii Meshcheriakov2021-07-176-140/+131
| | | | | | | | | | | | Replace most uses of str.format() and string arithmetic by f-strings. This results in more compact code and the code is easier to read when using an appropriate editor. Task-number: QTBUG-83488 Change-Id: I3409f745b5d0324985cbd5690f5eda8d09b869ca Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 41458fafa0996660890099d8527756c3582282cf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Don't use u prefix for strings in python filesIevgenii Meshcheriakov2021-07-154-188/+188
| | | | | | | | | | | This prefix is useless with Python 3. Task-number: QTBUG-83488 Change-Id: Ic008d53fe506865759e9a5003f439f7ac107b9e6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 53382b7b07b136c6550b0c74a0c5769b8158d4ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Use super() to call base class methodsIevgenii Meshcheriakov2021-07-152-10/+5
| | | | | | | | | | | | This is the standard way to call base class methods in Python 3 and it is shorter than the custom one used now. Task-number: QTBUG-83488 Change-Id: Ifaff591a46e92148fbf514856109ff794a50c9f7 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 2f4868548be8b3821cdbec047892b7d940c04908) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Convert CLDR scripts to Python 3Ievgenii Meshcheriakov2021-07-158-30/+23
| | | | | | | | | | | | The convertion is moslty done using 2to3 script with manual cleanup afterwards. Task-number: QTBUG-83488 Change-Id: I4d33b04e7269c55a83ff2deb876a23a78a89f39d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit b02d17c5c0f01a6c24cacaea2a3a41bfcc37490f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Convert python comparison function to key functionEdward Welbourne2021-07-141-40/+17
| | | | | | | | | | | | | | | | | | | | | | Instead of implementing all the intricacies of a cmp for the python sort-function, support for which is due to be dropped at Python 3 in any case, implement a much simpler key function that achieves the same result. In the process, eliminate the ugly kludge of setting an attribute on a function to, in effect, communicate with it via a global. Instead, instantiate a class, that wraps the value previously given to the attribute and whose instance provides the key-function. Thanks to Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> for pointing out that a key function is the way of the future - and sorted() is a nicer way to sort. Change-Id: Icf1ed5597fedf420d054fbc860e3e7fc6615875c Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit a37c0ef55f2725e7d8db43cac78fca9efe9a1ebf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make locale ordering transitiveEdward Welbourne2021-07-141-27/+36
| | | | | | | | | | | | | | | | | | | | | | | | The ordering function used to sort the locale data generated for QLocale attempted to sort the default territory for a given language and script before other territories, but was too tangled for it to be obvious this is what it was doing. The result turned out to be non-transitive. Replace with code that implements the same preference but only applies it where the result is compatible with transitivity. This leads to a shuffling of the order of the Serbian-language locales, which sorts the Cyrillic ones before the Latin ones. This is consistent with my reading of the CLDR data, which fills in Cyrillic and Serbia for Serbian; Serbian/Cyrillic/Serbia did previously sort before all other Serbian variants. Thanks to Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> for discovering the non-transitivity. Change-Id: I0ce9f78e620e714f980f32b85b7100ed0f92ad74 Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 7dec56c6a5ee985f91dd2197225131c028b33650) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* cldr.py: Avoid raising StopIteration from generatorsIevgenii Meshcheriakov2021-07-091-5/+10
| | | | | | | | | | | | | The behavior of StopIteration in generators was changed in Python 3 (see https://www.python.org/dev/peps/pep-0479/). Not raising that exception makes it easier to port the code to Python 3. Task-number: QTBUG-83488 Change-Id: Iac6e3f6f1e1e8ef3a1a0d89b19d2ac2d186434f5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit d804d21e8f5d9e1cd7fd4ae9a3f2394642d1f7d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Don't attempt to access property 'message' of IOErrorIevgenii Meshcheriakov2021-07-082-6/+6
| | | | | | | | | | | | | IOError does not have property 'message' in Python 3. Instead of attempting to access it, just use the string representation of the exception object. This produces the error message possibly combined with additional arguments in both Python 2 and Python 3. Task-number: QTBUG-83488 Change-Id: Icb198a409e7f80b832e474d8390b770fdeacc6c2 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 230014608571c2ad88b740455f4ffe1b963cad22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* qlocalexml2cpp.py: Remove undefined name inside error processing codeIevgenii Meshcheriakov2021-07-061-1/+1
| | | | | | | | | | | Name 'stem' is undefined inside CalendarDataWriter.write(). The error was repoted by flake8. Task-number: QTBUG-83488 Change-Id: Ib816b40d0bde2afd3112da76deee0ce39985693a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 6deb28f35aeb481d7ab7d3880340f5a23eeb1aec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_database: Sort lists of unused tags before printingIevgenii Meshcheriakov2021-07-061-1/+1
| | | | | | | | | | This way the output is easier to compare between versions. Task-number: QTBUG-83488 Change-Id: If4053c574c4ad200a179b06276bd889f2cb9e1c6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 1887c4ecc1426b1b32ace4b74503b469a2da9137) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* locale_data: Add new line at the end of script outputIevgenii Meshcheriakov2021-07-061-1/+1
| | | | | | | | | | Output of cldr2qlocalexml.py looks weird without the final new line. Task-number: QTBUG-83488 Change-Id: I5d675e475c57cdc8101887c39052007ba0a19857 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 0b2646c495d0b9052711f3790943e5354eb10407) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* dateconverter.py: Remove shebang and executable attributeIevgenii Meshcheriakov2021-07-061-1/+0
| | | | | | | | | | | | This is not a script that can be run independently. Task-number: QTBUG-83488 Change-Id: I82a93b9ab37ae759b789058d48e94298ecd29b6f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit f100d412b4e298bef2b5f2e2fb7afcc5a33be85b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix Vulkan to be found when targeting AndroidAlexandru Croitor2021-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Introduce two new packages WrapVulkanHeaders and WrapVulkan similar to the OpenSSL wrapper packages. WrapVulkanHeaders uses FindVulkan and is marked as found if Vulkan headers are found (that's the only part the Qt build requires). The WrapVulkan package is currently not used, but is there for symmetry. The Vulkan feature is now disabled by default on QNX, because the QNX toolchain file in the CI does not set CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding host Vulkan headers causing the build to break. Fixes: QTBUG-92157 Change-Id: I05309821f866456cd42e7f85bf8b76ba099df656 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit bb25536a3db657b41ae31e1690d230ef8722b57d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix mapping of MultimediaQuick internal moduleAlexey Edelev2021-06-221-2/+2
| | | | | | | | Task-number: QTBUG-94613 Change-Id: I7d5954c176c0f036a27b4ab1312505b77b2c67d5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit f522cfc9b991402a8dbfc18c6e65b01da09298e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Change Android emulator command pathHeikki Halmet2021-06-141-1/+1
| | | | | | | Change-Id: I6e7df6cdf7f0a0a7efea8fb7672be0b3df096d12 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 507499d4b650611ebc8194c2b6b9cd62d6977b26) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2021-06-091-1/+1
| | | | Change-Id: I89b022fe0c987a3f4c8cbf0bf9c1b00681292cb3
* Report unused enum members after CLDR data scanEdward Welbourne2021-06-072-4/+31
| | | | | | | | We should at least know when members of QLocale's enums aren't adding any value, and it may make sense to deprecate the unused ones. Change-Id: Icf202f81d2a35904c13ccdc202d41985bcb3f2e6 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Fix support for using system supplied md4c libraryNiclas Rosenvik2021-06-031-0/+1
| | | | | | | | | | | | | | | | | | | Add FindWrapSystemMd4c.cmake so that the old md4c target can be used as well as the new one and set WrapSystemMd4c_FOUND. Link to the imported target WrapSystemMd4c::WrapSystemMd4c if the system library is used. Add qt_find_package line to find the package in configure.cmake. Fix the condition for enabling system-textmarkdownreader, it includes testing for textmarkdownreader because even if the code would compile correctly without it, it looks strange when the output says "textmarkdownreader no" and under "using system libmd4c yes" even if libmd4c is not used. Use system include when system-markdownreader is enabled. Add library mapping for libmd4c. Change-Id: Id5d5b13d6691a8c1cdf627238887977c847c1e67 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add option to use different ANDROID_EMULATORHeikki Halmet2021-06-021-2/+6
| | | | | | | | | This change add option to determine used Android emulator version using environment variable. If variable is not set @x86emulator will be used as default value. Change-Id: Ifc52d07d058bf078bf915ca78683822a966b58fb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add the 'Private' suffix to the internal module name by defaultAlexey Edelev2021-05-311-0/+1
| | | | | | | | Modify pro2cmake to add the 'Private' suffix to the internal module name by default. Change-Id: Ia7b2fce387fad5f207a7379ac738173ff9262071 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add the 'Private' suffix to the internal module namesAlexey Edelev2021-05-311-16/+16
| | | | | | | | Rename internal modules to adjust their names to the internal module policy. Also modify mappings of the qmake file converters. Change-Id: I69aee1e8136c2379608d9d22d718f8c8a5f73124 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CI: explicitly use -gpu swiftshader_indirect with Android emulatorAssam Boudjelthia2021-05-311-1/+1
| | | | | | | Force the emulator to use software acceleration to avoid a crash. Change-Id: I1e73b8bc6485b0854cf83f5d9faa5d5f872a90df Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Nomenclature change: s/countr/territor/g in locale scriptsEdward Welbourne2021-05-267-103/+103
| | | | | | | | | | Change the nomenclature used in the scripts and the QLocaleXML data format to use "territory" and "territories" in place of "country" and "countries". Does not change the generated source files. Change-Id: I4b208d8d01ad2bfc70d289fa6551f7e0355df5ef Reviewed-by: JiDe Zhang <zhangjide@uniontech.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Rename util/locale_database/enumdata.py's various *_list to *_mapEdward Welbourne2021-05-263-17/+17
| | | | | | | | | These variables provide mappings, not lists, so name them non-deceptively. Change-Id: Idf15e78ad73790bc86dd8b9d4f248d1c4f73993c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* QLocaleXmlWriter.enumData(): move enumdata import to method from callerEdward Welbourne2021-05-262-8/+8
| | | | | | | | | The only reason cldr.py imported enumdata was so as to pass what it imported to writer.enumData(); that method might as well do the import itself. Change-Id: Ie77dcd29058f926b8cca4deef35837f30505859f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Remove unused functions from enumdata.pyEdward Welbourne2021-05-181-24/+0
| | | | | | | | | | It's now a data-only module. The callers of its code-to-ID functions have, for some time now, been rearranging its mappings to get at data efficiently. Change-Id: Ia16dcaa767203cdf3b81a96bd51793491ad41563 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix BASE argument of qt_add_resourcesJoerg Bornemann2021-05-181-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BASE argument of qt_add_resources now denotes the root point of the alias of the file. Before, BASE was merely prepended to every file that got passed to qt_add_resources. Old behavior: qt_add_resources(app "images" PREFIX "/" BASE "../shared" FILES "images/button.png") Alias is "../shared/images/button.png", and pro2cmake generated QT_RESOURCE_ALIAS assignments to fix this. New behavior: qt_add_resources(app "images" PREFIX "/" BASE "../shared" FILES "../shared/images/button.png") The alias is "images/button.png". No extra QT_RESOURCE_ALIAS assignment is needed. The new behavior is in effect for user projects and for Qt repositories that define QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Qt repositories will be ported one by one to this new behavior. Then the old code path can be removed. Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: Ib895edd4df8e97b54badadd9a1c34408beff131f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* pro2cmake: Add support for standalone CMake test configurationCristian Adam2021-04-271-0/+6
| | | | | | | | | | | | This patchset adds the bits needed for manual tests to work standalone. Amends ebaa1c15a101579d9296336491e36c63b979f18d Pick-to: 6.1 Task-number: QTCREATORBUG-25389 Change-Id: Ifc70391bda2a3eea3c7492a58353a703cdc3114c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 11:19:00 +0000