summaryrefslogtreecommitdiffstats
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
...
* uic: Use fully qualified enum value for remaining casesFriedemann Kleint2023-11-151-3/+3
| | | | | | | | Task-number: PYSIDE-2492 Task-number: PYSIDE-1735 Task-number: QTBUG-118473 Change-Id: I4e5e328b0757145df2ceb550e2f90a64be91d5e9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* uic: Write fully qualified enum values for QMainWindow enumerationsFriedemann Kleint2023-11-151-5/+13
| | | | | | | | Task-number: PYSIDE-2492 Task-number: PYSIDE-1735 Task-number: QTBUG-118473 Change-Id: Ief50914bae3cc8e55f61113e8c8b6d6d24fe2c0f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* uic: Prepare for encountering fully qualified enum values in new .ui filesFriedemann Kleint2023-11-151-24/+38
| | | | | | | | | | | | | | | | This means checks have to be rewritten using endsWith(). It mainly affects the QSizePolicy handling whose values originate from different sources, including numbers. To address this, refactor the code to deal with unqualified enum value names and introduce a helper function that fully qualifies the enumeration when writing out. Pick-to: 6.6 6.5 Task-number: PYSIDE-2492 Task-number: PYSIDE-1735 Task-number: QTBUG-118473 Change-Id: Iccbb884777aa9c696fbf48f9d7329353ef945b0f Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* windeployqt: improve MSVC runtime detectionYuhang Zhao2023-11-021-3/+13
| | | | | | | | | | | | | | | MSVC runtime dlls also include vccorelibXXX.dll, concrtXXX.dll, beside these traditional dlls, it's also possible to link against the new UCRT runtime, the ucrtbase.dll (and possibly including the API Set dlls), so we need to add some more checks to make windeployqt more robust. I've tested a custom Qt build locally, which I managed to make it link to ucrtbase.dll only, and this code works fine. Pick-to: 6.6 Change-Id: I00bc8666d8850aac279b8747465879e39348ba02 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io>
* uic: Port enumeration lookups to QLatin1StringViewFriedemann Kleint2023-11-023-53/+53
| | | | | | | | | | | This makes string operations on them easier. Pick-to: 6.6 6.5 Task-number: PYSIDE-2492 Task-number: PYSIDE-1735 Task-number: QTBUG-118473 Change-Id: I92922b701fd72f5521eee7f6d3ef63492e03be9b Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Windeployqt: add options to deploy/block pluginsTimothée Keller2023-10-314-29/+269
| | | | | | | | | | | | Some plugin types are pulled in by default by certain modules. Give users the option to add/skip plugins and/or their types. [ChangeLog][Tools][Windeployqt] Windeployqt now has options that allow for custom plugin deployment. Users can include or exclude them, either individually, or by type. Fixes: QTBUG-117910 Pick-to: 6.6 Change-Id: I85235783dcd814396f184912269cd5976717b2dd Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* no-thread: don't build macdeployqtMorten Sørvig2023-10-311-1/+1
| | | | | | | macdeployqt requires multithrading support. Change-Id: Ie561434d68f46bc82ec603aee2c36cd43597073a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Prefer using override instead of virtual in qdbusxml2cppAhmed Kerimov2023-10-271-1/+1
| | | | | | | | | | | | | | In C++ 11 override keyword was introduced to allow overridden functions to be marked appropriately. Its presence allows compilers to verify that an overridden function correctly overrides a base class implementation. This can be useful as compilers can generate a compile time error when: - The base class implementation function signature changes. - The user has not created the override with the correct signature. This commit improves the D-Bus interface code generation. Change-Id: I0353575c3f70277d04e41b8fa0096c1b2b28058a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* androiddeployqt: Copy templates and stdcpp lib in auxillary modeNikunj Arora2023-10-191-7/+6
| | | | | | | | | | [ChangeLog][Android][Deployment Changes] Now the auxillary mode of androiddeployqt also copies the templates and the stdcpp lib file without building the APK. Fixes: QTBUG-115241 Change-Id: I3d4647277e7f62f079c683645443462ef8026948 Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
* macdeployqt: Fix codesigning with @loader_pathJonas Kvinge2023-10-171-0/+4
| | | | | | | | | | | When the -executable parameter is specified, macdeployqt uses @loader_path instead of @rpath. This case was not handled in getBinaryDependencies() used for the code signing. Fixes: QTBUG-118075 Pick-to: 6.6 Change-Id: Ie1e0d0781305e1849df9ec0d5fb1c3ce6713a62b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* windeployqt: Don't copy files from unneeded QML modulesArno Rehn2023-10-102-4/+24
| | | | | | | | | | | | | | | | | | | Previously, windeployqt would recurse into subdirectories when copying QML modules, even if those subdirectories were a nested QML module that was not needed for deployment. Since most QML modules are nested in the QtQuick and QtQml modules, the old code effectively always copied *all* QML modules. This patch adds guards that prevent recursing into subdirectories if those subdirectories represent QML modules. These nested modules will still be deployed, but only if referenced from the QML application (as determined by qmlimportscanner). Fixes: QTBUG-117459 Pick-to: 6.6 Change-Id: I4c0dfc15956ff40a0e8caec3fa334df10cc92ccd Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Search extra library paths for Android dependency XML files as wellVolker Krause2023-10-071-0/+5
| | | | | | | | | | | | | | | This fixes a regression compared to Qt5. In Qt5 absoluteFilePath() unconditionally searched for all files in extra prefix dirs and the Qt install prefix, in particular also the -android-dependencies.xml files. After the changes in Qt6 up to now however those files are only searched in the Qt install prefix. This broke external libraries also making use of the -android-dependencies.xml mechanism, such as some KDE frameworks. Pick-to: 6.5 6.6 Change-Id: Ic53aab50c70f853f3b1d621d6de6edb3df223905 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Windeployqt: fix typoTimothée Keller2023-10-061-1/+1
| | | | | | | | | | Change "qpaths" to "qtpaths" since the former is not a valid option. Fixes: QTBUG-117817 Pick-to: 6.6 6.5 Change-Id: Ib8c8c80f31c1c54747340442c6bf3185c7c69001 Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* macdeployqt: Also look for app libraries with .so extensionJonas Kvinge2023-09-271-1/+1
| | | | | | | | Fixes deploying glib-networking gio modules which uses .so file extension. Change-Id: I6b4c4e9c3bb5745ffa33d7e83c5853a9372f1ca6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Android: bump Android target API level to 33Assam Boudjelthia2023-09-231-1/+1
| | | | | | | | | To follow latest Play Store requirement. Pick-to: 6.6.0 6.6 6.5 Fixes: QTBUG-112637 Change-Id: I1ef4f8b639f4b0cc759a2363b7b9b9864b159509 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Remove framework-related functionality from syncqtAlexey Edelev2023-09-221-30/+4
| | | | | | | | | | | | | | | | | | The files generated by syncqt should land not only in module include directory, but also in framework directory. Before syncqt made two copies of the generated files one in staging directory and the second one in module framework directory. This commit moves all logic related to framework header files to cmake scripts. This is done for both consistency and simlifying the logic. The whole module .syncqt_staging directory is copying to the framework library in cmake. [ChangeLog][Tools][syncqt] '-framework' and '-frameworkIncludeDir' arguments were removed. The related logic is moved to cmake scripts. Task-number: QTBUG-116483 Pick-to: 6.6 6.5 Change-Id: If79c5470d2ab51eb7fc083bce6fb01858bed76ba Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* moc: make qHash(SubArray) accept a seedMarc Mutz2023-09-201-3/+3
| | | | | | | | | | | This prevents the use of the one-arg-to-two-arg adapter template which we'd remove rather sooner than later, because it's causing all sorts of problems, but probably can't, until Qt 7. Pick-to: 6.6 Task-number: QTBUG-116074 Change-Id: I5907da0dc8c01b636d16dcc01e9c808ab9a85081 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Iterate over all extraPrefixDirs when collecting "directories"Alexey Edelev2023-09-151-5/+22
| | | | | | | | | | | | | | | | | When collecting plugins required for the android application according to linked targets we should take into account all prefix directories. But not only the first one. Otherwise the order we use when adding paths to extraPrefixDirs will affect collecting of the plugins. This specifically leads to the issue if the user project builds custom Qt plugins. The plugin directory from user project build tree will be found first and all plugins from Qt installation directory are discarded. Pick-to: 6.6 6.5 Fixes: QTBUG-116920 Change-Id: Id94ebaf5ccd1a279a74b38b59ff535f45230e1b4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* syncqt: Generate the deprecated header in the framework directory tooAlexey Edelev2023-09-121-2/+10
| | | | | | | | | | | Generate the missing deprecated header in the framework directory for the cross-module deprecation case. Amends 7e84a04563142d217317928865a8f6475d189d95 Pick-to: 6.5 6.6 Change-Id: Ibb2d262e41c6de7dfb34c39cabd6b19c43aa9636 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* syncqt: Mark updateOrCopy as exception freeAlexey Edelev2023-09-121-2/+3
| | | | | | | Pick-to: 6.5 6.6 Change-Id: I4ac468ef503775bca7d3848d26b42990bb4fdd1a Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* syncqt: Catch fs exceptions that happen when clearing staging directoryAlexey Edelev2023-09-121-17/+28
| | | | | | | Pick-to: 6.5 6.6 Change-Id: I1617f0940e1b1d892d321fc6f5df11262ee1f288 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* syncqt: Add the missing is_open check to writeIfDifferentAlexey Edelev2023-09-121-0/+4
| | | | | | Pick-to: 6.5 6.6 Change-Id: I2a969483d20f250083c1a262bd3bfc696a7f0df4 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* syncqt: Add the missing file stream close callsAlexey Edelev2023-09-121-0/+2
| | | | | | | | | Call close explicitly to avoid any issues related to non-closed file descriptors. Pick-to: 6.5 6.6 Change-Id: I02df30032dc04afd5d135d707eff4a6efe6a3ea5 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* syncqt: Handle possible exceptions thrown by std::filesystem::create_directoriesAlexey Edelev2023-09-121-7/+33
| | | | | | | | | Wrap the directory creation logic with try/catch to handle possible file system exceptions. Pick-to: 6.6 6.5 Change-Id: I11ad4552dccfdc8cc8a4ec4912d0a15d0f9557c6 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* [windeployqt] Copy v8 context snapshotAnu Aliyas2023-09-121-5/+7
| | | | | | | | | - Copy v8 context snapshot while creating package with windeployqt Fixes: QTBUG-116777 Change-Id: I707e1d147ebf0ba5ee63dd25218e23ac850efe45 Pick-to: 6.6 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Require the C++17 standard for configure-time syncqtAlexey Edelev2023-09-111-1/+1
| | | | | | | | | | | Require the C++17 standard, but not what is set by Qt for syncqt, to avoid unwanted standard check in some corner cases. Pick-to: 6.5 6.6 Task-number: QTBUG-116789 Change-Id: I34e07e172e31d5ffc69b84dd3ef30f02f6e75a9d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* tools: use const methods moreAnton Kudryavtsev2023-09-083-4/+4
| | | | | | | to avoid implicit detach Change-Id: I6268d4397631a2a2ff54263dfd0b28a7990c5993 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add StateLocation & GenericStateLocation to StandardLocationJonathan Ketchker2023-09-071-0/+2
| | | | | | | | | | | | | | | | | | | | | The latest XDG spec (0.8) defines XDG_STATE_HOME that does not exist in QStandardPaths::StandardLocation. Some Linux distributions clean XDG_CACHE_HOME on restart which makes XDG_STATE_HOME useful as a path for saving application state. This commit adds StateLocation and GenericStateLocation to serve as a StandardLocation for XDG_STATE_HOME for all platforms. This commit also updates docs and tests to fit the new changes. [ChangeLog][QStandardPaths] Added StateLocation & GenericStateLocation to StandardLocation Change-Id: I470602466c37f085062cc64d15ea243711728fa5 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove redundant QPair includesAhmad Samir2023-09-061-1/+0
| | | | | | | | Nothing in those files uses QPair; and a local build finished fine without them. Task-number: QTBUG-115841 Change-Id: I669cfecaa9129bce6b31e464826287f138b159db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add enablers to expose semi-public APIs for QtQuick3DChristian Strømme2023-09-051-6/+35
| | | | | | | | | Follow the same patterns as for qpa and rhi. Semi-public APIs will be put under the "namespace" ssg which is short for Spatial Scene Graph. Taks-number: QTBUG-116570 Change-Id: I38887f129ec90e67f6a929a0d8ea5ea8b8c49ee8 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* syncqt: Close ifstream before attempt to remove fileAlexey Edelev2023-09-021-2/+7
| | | | | | | | | | | ifstream may block the file descriptor in some operating systems. Wrap the reading of files in staging directory with extra scope, to make sure that ifstream closed the descriptor before the removal attempt. Also make sure that we closed the ifstream explicitly. Pick-to: 6.5 6.6 Change-Id: I56ef5e9925501912d5cd61e8545f664e0a0d90b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QCBorDevice: add missing #includeAhmad Samir2023-09-011-0/+2
| | | | | | | | For uchar. Otherwise static analyzers, e.g. clazy, complain about unknown types. Change-Id: Ie6a91f6e33eb9149b2d0188069edc2aa8f64a55b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Allow generating deprecated header files cross-moduleAlexey Edelev2023-08-291-14/+42
| | | | | | | | | | | | If some header files were moved to another module within same repo it makes sense to allow deprecating them. 'syncqt' now is able to detect this kind of header files if the 'foreign' module is specified in qt_deprecates pragma as part of the deprecated header name. Pick-to: 6.5 6.6 Task-number: QTBUG-116483 Change-Id: I479ea60e71de112b67c281722600cd818aac7762 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* moc: Drop support for function declaration without type specifierFabian Kosmale2023-08-261-28/+23
| | | | | | | | | | | Neither C++ nor modern C allow omitting the type (which used to be equivalent to an "int" return type). moc should not try to parse functions in C code, as they cannot be meta-methods. So there is no point in supporting it. Change-Id: I2b3a492988f29e8139311db64be110581cc1a4de Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove elfreader and other unix leftovers from windeployqtOliver Wolff2023-08-226-654/+18
| | | | | | | | | | | Back then elfreader and other unix functionality was added for the purpose of having one generic deployment tool but it was never used. Remove the code to be more clear on what to expect. Pick-to: 6.6 Change-Id: I2b7a759de04afe0c5fb210ad65f1c86e32934f18 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* androiddeployqt: Fix generation of qtDataDirectoryAaron McCarthy2023-08-151-1/+1
| | | | | | | | | | | | | Commit 9db5ca87897340873a4606c651a37e0356e8f1a0 sets the default qtDataDirectory to the value of qtInstallDirectory, which results in an invalid path when appended to the SDK. This results in build failures for Android when building with qbs. cmake builds are not affected as the data directory is explicitly set in the build scripts. Pick-to: 6.6 6.5 Change-Id: Ia29c5bae7648f5fccefe019c225e187985bd2592 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Fix registration of QtDBus types' metatypesThiago Macieira2023-08-141-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | By actually registering them. Commit 850d850c5af8ff77a4b9d53457ec6b1ba6c20cb3 changed from qMetaTypeId<QDBusArgument>() to QMetaType::fromType<QDBusArgument>() and in Qt 6, fromType() does not register the type with the database. That means the lines became runtime no-ops at that time or during the QMetaType updates since 6.0. All they did was instantiate the C++ inline variable. The testing also detected we didn't register QList<QDBusVariant> as an alias for the "av" signature. I'm not entirely sure you're allowed to use this because QtDBus does not like re-registration of the built-in types, and "av" is already assigned to QVariantList. This is no trouble for the parser, anyway. Minor change to qdbuscpp2xml to allow reading from stdin, so we don't have to create temporary files. Pick-to: 6.5 6.6 Fixes: QTBUG-115964 Change-Id: I80612a7d275c41f1baf0fffd177a14925e7d23ac Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
* moc: Remove remnants of USE_LEXEM_STOREFabian Kosmale2023-08-104-61/+2
| | | | | | | | | | Defining USE_LEXEM_STORE breaks compilation, and the commit that introduce it (in the pre-public history) does not shed any light on its usage. Change-Id: Ic616bf9f2584151dab3f654d64025fcdc0ade25c Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* macdeployqt: port away from Q_FOREACH and mark the tool free of itMarc Mutz2023-08-052-7/+12
| | | | | | | | | As a drive-by, fix a detach attempt in an existing ranged for-loop by making the container const, and don't re-construct the same QDir three times, just once, at beginning of the function. Change-Id: I5031c4b63dd939ae93dd119b01d1cad5e655f733 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qdbuscpp2xml: Support MEMBER field of Q_PROPERTYIevgenii Meshcheriakov2023-08-031-0/+2
| | | | | | | | | | | | | Emit properties with MEMBER field specified with 'readwrite' access. Previously only READ and WRITE filed where used for deriving the access value. Add a property using MEMBER to the test class used by tst_qdbuscpp2xml. Fixes: QTBUG-115631 Change-Id: I12351985a9fafd934ccc5e0b805077a9e44b6608 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* moc: handle "L" integer suffixFabian Kosmale2023-07-281-3/+9
| | | | | | | | | | | | | | | | This commit adds some initial support for handling the 'L' suffix after numbers. This one is especially important given that the __cplusplus define is using it. Other suffixes will be handled in some later commit, which should also unify the already divergent parse behavior between DIGIT and PP_DIGIT parsing (e.g. when it comes to byte prefixes). Task-number: QTBUG-83160 Task-number: QTBUG-115558 Pick-to: 6.6 6.5 6.2 Change-Id: Ie61eae49c468abfaee80e7e4f7097917a254dc0e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* windeployqt: Do not deploy insighttracker plugin by defaultOliver Wolff2023-07-271-4/+25
| | | | | | | | | | | | | | | | Qt insight's TP is using plugin type "generic" so that insight plugins can be deployed for every Qt application. As "generic" plugins are part of QtGui windeployqt deploys these if a dependency to QtGui is found. As defaulting to a deployment of insight plugins might cause confusion among users, we make deployment of these plugins explicit if the module is available. Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I9d2a8595373d5a15b7afbeaf7174226563b1cb6f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Make sure that the 3rdparty directory belongs to the moduleAlexey Edelev2023-07-191-2/+9
| | | | | | | | | | | | | If the path where Qt sources are located has 3rdparty in it we skip headers processing since all headers are treated as 3rdparty. Use path relative to the source directory when indentifying the 3rdparty header files using regex. Fixes: QTBUG-115324 Pick-to: 6.5 6.6 Change-Id: If97328cb9a9ece01d43c56022f4613da9b29c03f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Put arguments in correct order in syncqt parseVersionAlexey Edelev2023-07-191-1/+1
| | | | | | | | Amends 4d4e74e1bcad47476b947b6e3781b046f9505f83 Pick-to: 6.6 Change-Id: Ie3a0147b414303c528b78c20f6502b83c5102344 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add the 'version' argument to 'qt_deprecates' pragmaAlexey Edelev2023-07-121-11/+73
| | | | | | | | | | | | | | | | | | | | | | syncqt uses qt_deprecates pragma to generate deprecated header files that might live forever in Qt packages. This adds the version argument to the pragma, that allows specifying the version when the respective header file should be removed. The new pragma format is the following: pragma qt_deprecates(<header>[,<major.minor>]) If deprecation version of the deprecated header file is lower than the current Qt version, syncqt will display the respective warning in the log and skip generating the deprectated header file. Also the user warning message now displays the exact version when the header file will be removed. Task-number: QTBUG-115029 Pick-to: 6.6 Change-Id: Ifd7464b8539b8be93b95690fd1ca70ef0b14e436 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* moc: Print sterror(errno) when moc can't write the output fileAlexandru Croitor2023-07-121-3/+6
| | | | | | | | | | Also prepend a "Error:" label to all strrerror handling locations, to make it clear where the error starts. Pick-to: 6.2 6.5 6.6 Task-number: QTBUG-101926 Change-Id: I1a781b4c5716636eff4d47a6c8554dcbd51d2697 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* moc: Store errno after fopen callAlexandru Croitor2023-07-121-2/+8
| | | | | | | | | To avoid QFile::encodeName() potentially overriding the value. Pick-to: 6.2 6.5 6.6 Task-number: QTBUG-101926 Change-Id: Ie751df877d6624238ded344474b5eccc324ec541 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Windeployqt: also add internal modules to module listTimothée Keller2023-07-122-2/+4
| | | | | | | | | | | | | | Not adding internal modules to the windeployqt module list makes it give off nonsensical warnings, and can force the deployment of debug libraries despite a --release tag. Add them in to prevent this, and shave off the "Private" part of the module name if it exists to maintain compatibility. Fixes: QTBUG-114854 Pick-to: 6.6 6.5 Change-Id: I884fdc495f340ad20ba6257587da170d6c1a1415 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Make sure that exception flags are not overridden in syncqt toolAlexey Edelev2023-07-101-0/+1
| | | | | | | | | | | | | qt_internal_add_tool has the implicit logic that disregards the previously installed flags and adds new flags that overrides the exceptions behavior. Add the tool-specific option to make sure that this won't happen. Ammends 0f5fbe369b84c422003e24322abc90a1b09520d2 Pick-to: 6.6 6.5 Change-Id: Id149d8d8002390581813475124ba37dd39d56b9b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* qdbusxml2cpp: Improve error reportingIevgenii Meshcheriakov2023-07-061-55/+117
| | | | | | | | | | | | | Use this format when reporting diagnostics relating to a source file: <file name>:<line>:<column>: {error|warning|note}: <message> This makes it easier to find the source elements that caused a diagnostics report. Fixes: QTBUG-2597 Change-Id: I8d8d13f7d71d1ce0c5050a0d08dddd33f9997f27 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 03:48:59 +0000