summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* Enable QT_TYPESAFE_FLAGS for bootstrap and QtCoreGiuseppe D'Angelo2021-06-231-0/+1
| | | | | | Change-Id: I5c64a29ffecece9e527f5db78cceb912836153d3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qtpaths: Prevent tool messages from appearing in qtbase.tsFriedemann Kleint2021-06-151-30/+29
| | | | | | | | | | The tool used QCoreApplication::translate(), but did not attempt to load a QTranslator. Use QStringLiteral() instead. Pick-to: 6.2 Task-number: QTBUG-75870 Change-Id: Ib3c6b1893889a82b186a310c0c725dbf1a1885b3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Android: don't call qmlimportscanner if no qml dir existAssam Boudjelthia2021-06-071-14/+38
| | | | | | | | | | | If only qtbase is installed, androiddeployqt might call qmlimportscanner which will fail to find a qml dir under the Qt install path. Thus, we check if the qml dir exists before calling qmlimportscanner otherwise throw a warning. Fixes: QTBUG-89588 Change-Id: I706eb2a233e9ab5b250652cd46aae75cab178648 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Android: fix androidtestrunner passing when output file doesn't existAssam Boudjelthia2021-06-071-1/+12
| | | | | | Task-number: QTBUG-88508 Change-Id: If19d2b272b1760228b6a1e6e1af6db3bfbf0ec1e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* moc: Add relative property index to JSON output of PropertyDefAndrei Golubev2021-06-022-5/+7
| | | | | | | | Needed for QML compiler to know property index of C++ type at compile time without going through QMetaObject::indexOfProperty Change-Id: I404e71d6071d36812661df17d12b879a8dcbd146 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Android: make the help print a bit easier to read and navigateAssam Boudjelthia2021-06-022-7/+35
| | | | | | | | Add new line between each argument type in the help print to make it easier to read and not a big wall of text. Change-Id: I7c7b2d2b59ef3a0889d1bb8c7af3d00b82bf820d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* uic: No longer generate star imports in PythonFriedemann Kleint2021-06-014-59/+182
| | | | | | | | | | | | | Use class WriteIncludesBase and store classes encountered in a per-module hash (Qt/custom widgets). Write out only the required classes. Add --star-import as a fallback should the change cause issues. Task-number: PYSIDE-1404 Change-Id: Ic50e26758ddd0f2f8aebbce470d32a36fb09a2c4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Avoid blocking read from stdin when collecting json filesAlexey Edelev2021-05-313-6/+9
| | | | | | | | | | | Change the behavior of moc when collecting json files. If argument files are specified, suppose moc received empty input and skip input from standard input. Pick-to: 6.1 Fixes: QTBUG-93504 Change-Id: I45ec790ed458f1fae543d069555bc8abc6560816 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* uic: Add further widgets to class lib mapFriedemann Kleint2021-05-251-0/+3
| | | | | | | | It should be possible to use them with promotion. Task-number: PYSIDE-1404 Change-Id: Idea0ab076c66d2842958eabf66e5dc4f8e1bad3f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* uic: Extract a base class for WriteIncludesFriedemann Kleint2021-05-255-180/+288
| | | | | | | | | | | Extract base class WriteIncludesBase from WriteIncludes which basically adds the dependent classes. Move the classlibmap there as well. Task-number: PYSIDE-1404 Change-Id: I899c7818cb96dd3b1af5f328cd20d64fbaf7755b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* Deprecate qGlobalQHashSeed and qSetGlobalQHashSeed in Qt 6.6Thiago Macieira2021-05-232-4/+2
| | | | | | | That's two years from when the replacements were added (6.2). Change-Id: Id2983978ad544ff79911fffd1671f7dd38fede02 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Skip building debug bootstrap lib for CMake 3.20 and multi-config buildLi Xinwei2021-05-231-0/+5
| | | | | | | | | | | When building qtbase with CMake 3.20, only release tools will be built by default in a multi-config build, so it is possible to skip building debug bootstrap lib. Task-number: QTBUG-88414 Change-Id: I266ac458ae3c89c593656e4ebdc788ae5797b788 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* rcc: Fix error message when temporary file cannot be openedJoerg Bornemann2021-05-211-1/+1
| | | | | | | | | If rcc cannot open the file passed with --temp, display the path of the temporary file, not the one of the output file. Pick-to: 6.1 Change-Id: I58f8ab2f68ac2f1a19feb6b02974dff9fc8b7ec1 Reviewed-by: hjk <hjk@qt.io>
* androiddeployqt: Refactor apkSignerRunnerLars Schmertmann2021-05-211-15/+15
| | | | | | | | Avoid to publish all local variables in the lambda and only provide the necessary information as parameter. Change-Id: Iea68280f79f90ac3d5f7b9a0a92e073865a1d291 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Add proper dependencies to apk targetsJoerg Bornemann2021-05-171-20/+17
| | | | | | | | | | | | | | | | | | | Before, building ${target}_make_apk always re-built the apk, instead of rebuilding the apk only when inputs changed. This patch fixes that by moving the creation code from a custom target to a custom command with proper dependencies. The androidtestrunner tool now does not check for the existence of an apk anymore and always runs the make command that is supposed to build the apk. The ${target}_prepare_apk_dir target is not needed anymore by the Qt build but is still used by Qt Creator's Android support. Add a clarifying comment. Fixes: QTBUG-93431 Change-Id: I00d65d616fef9511b03b65f879c4bc6cb92dfc30 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Allow for arguments that have an equals as part of itAndy Shaw2021-05-141-3/+3
| | | | | | | | | | Since you can pass a define to org.gradle.jvmargs that can have the name=value approach, then we need to ensure that this is accounted for. Task-number: QTBUG-88989 Pick-to: 6.1 5.15 Change-Id: I2a795bff7ce683eca521b3a987293b3320accb6a Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Android: check that app's lib_name value doesn't contain spacesAssam Boudjelthia2021-05-121-0/+9
| | | | | | | | | | android.app.lib_name is used for the app's lib that contains the main() function, *.so lib files usually have non-spaced names, thus to avoid wrong changes done to the manifest file, it's better to throw an error in this case. Change-Id: I4d4f0235612b308c78fd06a77690604c5c69f8ff Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* androiddeployqt: Check if apk is already alignedMike Achtelik2021-05-121-18/+42
| | | | | | | | | | | | | Newer versions of the android gradle plugin already align the apk internally. Therefore it is not necessary to indiscriminately align every apk. So let's first check, if it is already aligned and only align it if necessary. This prevents possible alignment errors, which might occur when aligning it again. If it is already aligned, we can just copy and continue signing the apk. Fixes: QTBUG-88989 Change-Id: If29004e372e7927c88a900dc56f490bf9bce9ec7 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* QMetaMethod: Store method constness in metaobject systemFabian Kosmale2021-05-071-1/+6
| | | | | | | | | [ChangeLog][QtCore][QMetaMethod] It is now possible to query the constness of a method with QMetaMethod::isConst. Change-Id: I8a94480b8074ef5b30555aeccd64937c4c6d97d4 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Moc: parse trailing return typeMårten Nordheim2021-05-041-9/+21
| | | | | | | Pick-to: 5.15 6.1 Fixes: QTBUG-71123 Change-Id: I1c3749f0892fddcc433c9afcb1d6d7c30c97c9d9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* uic: Fix font family code generation for pythonFriedemann Kleint2021-05-033-2/+12
| | | | | | | | | | | Amend the code introduced by d8602ce58b6ef268be84b9aa0166b0c3fa6a96e8 to generator correct code for Python. Change-Id: I71fc9a1830d6bd591d32ce08002572c29f02a27f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit b2ebc64dd9914359fe8acf2bc9960e341e98cf80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Revert "Include qsimd.cpp in bootstrap build"Thiago Macieira2021-05-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 9268cb808510beb3f9c50fba273e67e5b560c3e6. That was done in the mistaken assumption that the bootstrap library needs the fast hashing algorithms. It doesn't, since it's only used for tools that need deterministic output anyway. This fixes the build on x86 where the compiler is enabling rdrand by default (Ivy Bridge systems, but also -march=haswell and the GCC 11 -march=x86-64-v3): qsimd.cpp:750:37: error: redefinition of ‘qsizetype qRandomCpu(void*, qsizetype)’ 750 | QT_FUNCTION_TARGET(RDRND) qsizetype qRandomCpu(void *buffer, qsizetype count) noexcept | ^~~~~~~~~~ In file included from qsimd.cpp:44: qsimd_p.h:354:25: note: ‘qsizetype qRandomCpu(void*, qsizetype)’ previously defined here 354 | static inline qsizetype qRandomCpu(void *, qsizetype) noexcept | ^~~~~~~~~~ Change-Id: I755911ae7d0341f49039fffd167afc7540bf0dd6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* uic: Update qclass_lib_map.hFriedemann Kleint2021-05-011-158/+7
| | | | | | Task-number: PYSIDE-1404 Change-Id: I6101402891749a767119a5688d9a5a6299ee840d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* uic/Python: Add comments for mypy to ignore star importsFriedemann Kleint2021-04-291-3/+3
| | | | | | | | | | Amends 2f975b39a967cd2ac1c234a200eb6b9c11d8b5b2. Pick-to: 6.1 5.15 Fixes: PYSIDE-1404 Change-Id: I534d78bdf44eb02bf80831a3d6c1d080a4e08698 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* Include qsimd.cpp in bootstrap buildTor Arne Vestbø2021-04-271-0/+1
| | | | | | | | | | QHash, which is included in the bootstrap library, uses qCpuFeatures() as part of the implementation of qHashBits(), when the __ARM_FEATURE_CRYPTO is available, so we need to ensure the definition of that function is also included. Change-Id: I3eeb3685335120a4861c397ab9c82540bcfcd17c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Introduce zlib find script to work around hardcoded iOS SDKAlexandru Croitor2021-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode allows building a project targeting either the device or simulator sysroot in one single build dir, but for the sysroot switching to work there should be no linker or compiler flags referencing absolute paths of a specific sysroot. During CMake configuration of a project targeting iOS, all found system libraries will be within one single sysroot, either the device one or the simulator one, whichever one was passed to CMAKE_OSX_SYSROOT. CMake will then generate the Xcode project and pass those absolute paths, which makes sysroot switching within Xcode not work. To avoid that, the CMake documentation recommends passing linker and framework flags of the form '-lfoo' and '-framework bar' instead of absolute paths. Xcode then takes care of setting the correct framework search path. Zlib is one of the libraries found in the iOS sysroot and thus passed as absolute path. To avoid that, create a new FindWrapZLIB find script. The target it creates will pass the absolute path to the library on non Apple platforms and an -lz linker flag on Apple platforms (macOS and iOS). To avoid issues with target global promotion when system PNG package is found, ensure that a found ZLIB::ZLIB target is promoted to global manually in src/gui/configure.cmake. Pick-to: 6.1 Change-Id: I8bd8649be4f680a331ad51925f27cb9d13ac5e5f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Add the "Territory" enumerated type for QLocaleJiDe Zhang2021-04-151-16/+16
| | | | | | | | | | | | | | | | | | | The use of "Country" is misleading as some entries in the enumeration are not countries (eg, HongKong), for all that most are. The Unicode Consortium's Common Locale Data Repository (CLDR, from which QLocale's data is taken) calls these territories, so introduce territory-based names and prepare to deprecate the country-based ones in due course. [ChangeLog][QtCore][QLocale] QLocale now has Territory as an alias for its Country enumeration, and associated territory-based names to match its country-named methods, to better match the usage in relevant standards. The country-based names shall in due course be deprecated in favor of the territory-based names. Fixes: QTBUG-91686 Change-Id: Ia1ae1ad7323867016186fb775c9600cd5113aa42 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix build without features.systemsemaphoreTasuku Suzuki2021-04-141-1/+1
| | | | | Change-Id: I73059f48d37253b5f962f96f693f26c7d55a31e1 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* androiddeployqt: Fix the fallback location of rccJoerg Bornemann2021-04-071-1/+11
| | | | | | | | | | Now, that rcc lives in libexec, we need to assume the location of rcc to be "bin" on Windows and "libexec" elsewhere. Pick-to: 6.1 Fixes: QTBUG-92245 Change-Id: Idb81a5d02bae9ca3254e7590140a128500572b07 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge integration refs/builds/qtci/dev/1616690051Qt CI Bot2021-03-251-49/+46
|\
| * Introduce QMetaObject::metaTypeFabian Kosmale2021-03-251-49/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function returns the metatype corresponding to the metaobject, or an invalid metatype for namespaces. This works as follows: First we increment the metaobject revision for new metaobjects. Metaobjects with older revisions are handled by doing a lookup by name. That fallback is also used for dynamic metaobjects (from QtDBUS and those created by QMetaObjectBuilder). For new metaobjects, we store the metatype in its metatype array, behind the property metatypes. This avoids any changes to the property and method metatype extraction logic: For properties, the metatype access does not change, as the new metatype is after their metatypes. For method metatypes, we already have an indirection layer (using offsets), so by adjusting those offsets by one, the same logic keeps working. To distinguish between namespaces and dynamic metaobjects, namespaces store the metatypeinterface pointer for void in the metatype array, whereas dynamic metaobjects store a nullptr. One nice additional benefit is that this simplifies the generator logic in moc, as the metatype array is now never empty. Task-number: QTBUG-92077 Change-Id: Id3f920f28553f12032a71a1a87dad29e5374dbe7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
* | Extend qtpaths functionally to replicate the 'qmake -query' behaviorAlexey Edelev2021-03-252-2/+80
|/ | | | | | | | | | | | | | | | | | | | | | | 'qt-version', 'install-prefix', 'binaries-dir' and 'plugin-dir' are covered by the introduced qt-query option. So make them obsolete and hidden in the application help. Note that the 'qtconf' option will affect the output of options associated with QLibraryInfo. [ChangeLog][Tools] qtpaths got new --qt-query argument that can be used instead of qmake -query. The new --qtconf, --query-format arguments allow you to further tweak its output. [ChangeLog][Tools] The qt-version, install-prefix, binaries-dir and plugin-dir options of the qtpaths tool are deprecated. [ChangeLog][Tools] The qtpaths tool has been moved from the qttools repository to the qtbase repository. Fixes: QTBUG-75870 Change-Id: I949acf79c8ce321811ee81cf707c1ae0eccb547d Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qtpaths: Fix cross compilation for windowsMartin Storsjö2021-03-151-2/+2
| | | | | | | | | | | | The cmake target may not be named "qtpaths", but one should be using ${target_name} instead. If cross compiling, and QT_BUILD_TOOLS_WHEN_CROSSCOMPILING isn't set, the tool won't be built at all and there's no such target to set properties on, and if it isn't set, the target name is something else. Change-Id: I3d904036106b38df6e56ad35d400cf9a0bb1cbdf Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move qtpaths from qttools repository to qtbaseAlexey Edelev2021-03-123-0/+352
| | | | | | | | | qtpath should replicate the functionality of 'qmake -query'. Also we want this tool to be available in builds without qttools. Task-number: QTBUG-75870 Change-Id: I6578fc4fc45dd940fd353a5cfe6db0a12744230a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Move build tools to libexec instead of the bin dirJoerg Bornemann2021-02-237-0/+7
| | | | | | | | | | | | | | [ChangeLog][Build System] Tools that are called by the build system and are unlikely to be called by the user are now installed to the libexec directory. This is a step towards easier co-installability of different Qt versions. Pick-to: 6.1 Task-number: QTBUG-88791 Change-Id: Id19575b5ba27795f7715e4ea6a09391b26dd4942 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove redundant code in androiddeployqt/main.cppEdward Welbourne2021-02-181-11/+4
| | | | | | | | Prompted by a PVS-studio article. Pick-to: 6.1 6.0 Change-Id: I9699cc9baf9c90a6cf5b9564cd175205a9b2fa6b Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Move static PCRE2 defines to non-system PCRE2 sectionAlexey Edelev2021-02-011-4/+8
| | | | | | | | | | | Private PCRE2-specific definitions should be only used with the built-in PCRE2 library. Ammends 7c69eb8868b6c79c3c70f3cd7ee6ceb188b0521b Fixes: QTBUG-90556 Change-Id: If47e0b9eaaece290676d6c2b484bb52281aa7c68 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Use system PCRE2 for Bootstrap libraryAlexey Edelev2021-01-251-33/+44
| | | | | | | | | By default, use system PCRE2 for Bootstrap library, if not cross-compiling. Fixes: QTBUG-90556 Change-Id: I7291927565484073cadacec9a381b54b44ebeaec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump copyright year to 2021Kai Köhne2021-01-252-4/+4
| | | | | | Change-Id: I18a9c2de391ca51655148b2e3cc9abdfbb8ddbcf Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update QVulkan(Device)Functions to Vulkan 1.2Laszlo Agocs2021-01-191-42/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also needs improvements to qvkgen. What we get with this patch are the Vulkan 1.1 and 1.2 core API's additional 11 instance-level and 30 device-level commands present in QVulkanFunctions and QVulkanDeviceFunctions. All of these are attempted to be resolved upon construction. When the implementation does not return a valid function pointer for some of them (e.g. because it is a Vulkan 1.0 instance or physical device), calling the corresponding wrapper functions will lead to unspecified behavior. This is in line with how QOpenGLExtraFunctions works. The simple autotest added to exercise some Vulkan 1.1 APIs demonstrates this in action. The member functions in the generated qvulkan(device)functions header and source files are ifdefed by VK_VERSION_1_{0,1,2}. This is essential because otherwise a Qt build made on a system with Vulkan 1.2 headers would cause compilation breaks in application build environments with Vulkan 1.0/1.1 headers when including qvulkanfunctions.h (due to missing the 1.1/1.2 types and constants, some of which are used in the function prototypes). In practice this should be alright - the only caveat to keep in mind is that the Qt builds meant to be distributed to a wide variety of systems need to be made with a sufficiently new version of the Vulkan headers installed, just to ensure that the 1.1 and 1.2 wrapper functions are compiled into the Qt libraries. Task-number: QTBUG-90219 Change-Id: I48360a8a2e915d2709fe82993f65e99b2ccd5d53 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Hardcode a special case of using qOverload for slots without argumentsJarek Kobus2021-01-151-8/+19
| | | | | | | | Pick-to: 6.0 Fixes: QTBUG-90308 Change-Id: I35cd45679ded626654dd0e7e3eea8a7bb14c1d56 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* qvkgen: Skip command elements with aliasLaszlo Agocs2021-01-151-2/+5
| | | | | | | | | | | | | | | | | | Otherwise we end up with generating broken qvulkanfunctions cpp and h files. For example, encountering the following command element should lead to taking no action, this is not something we want to emit a corresponding wrapper function for: <command name="vkResetQueryPoolEXT" alias="vkResetQueryPool"/> This is required to be able to upgrade the bundled vk.xml to something newer. Fixes: QTBUG-90330 Task-number: QTBUG-90219 Change-Id: Ie6e3a8794207e30a172820eb055238bf52a0c0b9 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Remove .prev_CMakeLists.txt filesJoerg Bornemann2021-01-1210-571/+0
| | | | | | | | | | Those serve no purpose anymore, now that the .pro files are gone. Task-number: QTBUG-88742 Change-Id: I39943327b8c9871785b58e9973e4e7602371793e Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove the qmake project filesJoerg Bornemann2021-01-0723-462/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* uic: Do not generate QComboBox::AdjustToMinimumContentsLength into codeFriedemann Kleint2021-01-041-6/+23
| | | | | | | | | | | | | | | | The enumeration value was removed in Qt 6 by 1a342b2db14fa92bca717f5daff950b2eef869f7. Ignore it. Add a check to helper function checkProperty() and move the code from a5e2f2ddad0cc6b6a06f51e0dce6acf0fecf9de6 there as well. Pick-to: 6.0 Task-number: QTBUG-89093 Fixes: QTBUG-89700 Change-Id: I0890be8fff155d7342e2386b7f6b0783a5f3a192 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* CMake: Fix FEATURE_static_runtime buildJoerg Bornemann2020-12-091-0/+1
| | | | | | | | | | | We must call qt_set_common_target_properties on Bootstrap too, because that's were FEATURE_static_runtime is handled. Change-Id: Ie54f7d599d0c3a54b761e6c679983b475e77c17d Pick-to: 6.0 Fixes: QTBUG-89201 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Eric Lemanissier <eric.lemanissier@gmail.com>
* Revert "Android: print tailored warning if qml dependency path is a dir"Assam Boudjelthia2020-12-091-8/+2
| | | | | | | | | | | | | | | This reverts commit c730a29260eda298683803bfd5306926696eedb0. Reason for revert: The original change was wrong and caused androiddeployqt to skip valid QML resource paths.  Additionally, change log output from "file" to "path" when skipping an import path. Pick-to: 6.0 5.15 Fixes: QTBUG-89281 Change-Id: Ic338d147a04a03bb1d7acbede11b647ff036922a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Remove qlalr documentation stubKai Koehne2020-12-084-261/+0
| | | | | | | | | The documentation is only a stub, and hasn't been built since Qt 4 times. qlalr is also first and foremost an internal tool nowadays, so it's very unlikely we will fully document it. Change-Id: I68821bf1f9ca3811ec8adda583f0c7326421c6b6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* rcc: Remove support for Python2Friedemann Kleint2020-12-073-41/+23
| | | | | | | Qt for Python only supports Python3. Change-Id: I7b13b1f9482579b1e1128d15ee5734d063a7c4b8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* uic/rcc: Use QT_VERSION_MAJOR for major versionFriedemann Kleint2020-12-072-10/+14
| | | | | | | | Amends 539a16a69fa1ef302cf4eb97ff5a7f8afb606d15. Task-number: QTBUG-89124 Change-Id: I68c9ab2179d464d83c3fd9eefc5609b7a5a58e27 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 07:52:54 +0000