summaryrefslogtreecommitdiff
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* MOC: pass the erroneous Symbol as an arg to Parser::error() overloadAhmad Samir2023-05-153-19/+27
| | | | | | | | | | | | | | | | | | | | We already know the Symbol while parsing, passing a reference to it to error() makes it simpler to construct the error message. This fixes an issue where reporting an error about "NONSENSE" in e.g.: Q_PROPERTY(Foo* foo NONSENSE foo) would be off-by-one and the error message would say: path/to/file.h:11:1: error: Parse error at "foo" instead of 'at "NONSENSE"', which is where the parser actually found an unexpected attribute. Fixes: QTBUG-36367 Pick-to: 6.5 Change-Id: Ief70e544af41f7575fbeea9b936fa8197c3ef43d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Tracepointgen: Fix debug print warningsAntti Määttä2023-05-111-5/+5
| | | | | | | Pick-to: 6.5 Change-Id: Id6386fd4226024b6bd919b20adc4a5b02c53bc80 Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* macdeployqt: Consider debug libs when looking for module dependenciesTor Arne Vestbø2023-05-051-1/+4
| | | | | | | | | | Otherwise we will fail to add plugins such as the SQL plugins, because we think that the Sql module is not in the list of module dependencies. Pick-to: 6.5 Change-Id: Ie03d2506e8d86904f51b4198641ad61a6977e592 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* macdeployqt: Detect debug dylibs, not just debug frameworksTor Arne Vestbø2023-05-051-1/+4
| | | | | | | | A debug dylib has a binary name like libQt6Core_debug.6.dylib Pick-to: 6.5 Change-Id: I54a7a7017b880c734777d0738acf46c19689148d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* Normalize paths using std::filesystem::weakly_canonicalAlexey Edelev2023-05-041-1/+1
| | | | | | | | | | | | std::filesystem::weakly_canonical resolves symbolic links in paths. This allows syncqt to work with paths that are symbolic links and real paths. Fixes: QTBUG-113295 Pick-to: 6.5 Change-Id: Ie7478b4accf279e8abf9f3849d18807cee99f085 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Create unique names for QSize and QRect types for lttngAntti Määttä2023-04-261-12/+12
| | | | | | | | Task-number: QTBUG-113161 Pick-to: 6.5 Change-Id: Icc47af16b73dd9ad4e203c3bd55833587435be5c Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* tracegen: Add common prologueAntti Määttä2023-04-265-0/+15
| | | | | | | | | | Add common prologue and add error message when tracing is used in a module that doesn't have Q_TRACEPOINT enabled, but tracing is enabled. Pick-to: 6.5 Change-Id: I64ca074942f6e89b4f5b5e3b6048b2b713c06df8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* windeployqt: improve debug detectionYuhang Zhao2023-04-261-10/+6
| | | | | | | | | | MSVC binaries can also be stripped and according to my experiments they still work normally. So we should not limit this check to MinGW only. Change-Id: I026d75a38b94f309ad695cf8f700ed3ac160dd87 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timothée Keller <timothee.keller@qt.io>
* Support float_type arrays when using lttngHatem ElKharashy2023-04-251-2/+13
| | | | | | | | | | | | | lttng ctf_array does not support float types which causes compilation error when a float type is passed to the function. A solution is to pass the array elements one by one to TP_FIELDS. Fixes: QTBUG-112761 Pick-to: 6.5 Change-Id: I30e7049d9eda1141298145897df372213145c1b4 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* Windeployqt: Add a check for LLVM-MinGW runtimesTimothée Keller2023-04-201-20/+36
| | | | | | | | | | | | | | | The compilerRuntimeLibs now pays attention to if the user is running MinGW, or LLVM-MinGW, before deploying the corresponding runtimes from the Qt binary folder, or from the path if it cannot find any in the Qt binaries. [ChangeLog][QtTools][Windeployqt] Windeployqt now supports LLVM-MingGW runtimes. Pick-to: 6.5 Change-Id: I9c464cdb933795e491992f5d1adb18bcc7d69f02 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org>
* Windeployqt: change MinGW dll's import locationTimothée Keller2023-04-171-11/+16
| | | | | | | | | | | | The MinGW runtimes were imported through the PATH, which creates mismatches with the expected libraries that are installed directly through Qt. Check if those can be used instead, and issue a warning (and default to PATH) if not. Fixes: QTBUG-112448 Pick-to: 6.5 Change-Id: I061baabb6d6188bd0817b68c39a5d9f04ff391b5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Rid of 'special case' markersAlexey Edelev2023-04-131-1/+0
| | | | | | | | | | | It's unlikely we will ever use pro2cmake at this project stage, so it doesn't make any sense to keep the 'special case' markers in the CMake scripts. Remove them and replace with TODO where needed. Change-Id: I84290c20679dabbfdec3c5937ce0428fecb3e5a7 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* windeployqt: Add option to skip plugin types during deploymentOliver Wolff2023-04-121-9/+21
| | | | | | | | Pick-to: 6.5 Fixes: QTBUG-112317 Change-Id: Idb294105ee2006a36067d3967af1b7b55b375bd7 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* windeployqt: Remove special handling of virtual keyboard pluginOliver Wolff2023-04-121-18/+0
| | | | | | | | | | | | virtualkeyboard is a qt module and thus covered by the "no-<module" switch. The special handling is no longer needed with the more dynamic approach of handling Qt modules. Pick-to: 6.5 Change-Id: Ice6e30261e60b484669748411e019764bbdeaa55 Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org> Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* syncqt: Add more information to verbose outputAlexandru Croitor2023-04-061-8/+39
| | | | | | | | Makes it easier to troubleshoot issues. Pick-to: 6.5 Change-Id: If50fafde8748bb0fde58f54ed55fe1ddf9bcf088 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Windeployqt: change qtModule return value to prevent invalid modulesTimothée Keller2023-04-061-8/+14
| | | | | | | | | | | | When the change from quint64 to bitsets was originally made, the return value of the qtModule function was not adapted. Where returning 0 was fine for the quint64 values which started at 1, returning 0 now adds the first module instead of adding nothing to the used/required modules Fixes: QTBUG-111984 Pick-to: 6.5 Change-Id: Id1e2b3237a36335ec5071180b4c73f99d5eb5c8d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: Prevent '.' and '..' from being added to lconvertTimothée Keller2023-04-061-1/+6
| | | | | | | | | | | | | | If windeployqt is not able to retrieve any translation information from the catalog, the translationNameFilters will be empty. This allows the '.' and '..' folders to be passed to lconvert which in turn causes an error for the whole deployment. Added a check for the filters being empty, and a warning in case we have to preemptively return from the translation deployment. Fixes: QTBUG-112204 Pick-to: 6.5 Change-Id: I0d114186e630cc3696250006fa093c4c596eb40d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: Simplify infix detection for --libinfix buildsTimothée Keller2023-04-061-18/+5
| | | | | | | | | Removed fetching the infix through the QtCore Module, since it is already provided by qtpaths -query Pick-to: 6.5 Change-Id: I844305fc66b21af094724dd3f516078447ee1dd2 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Android: allow using string based versions in compileSdkVersionAssam Boudjelthia2023-04-051-8/+42
| | | | | | | | | | | | | | | | Some platform sdk packages have names that contains non-integer characters such as android-33-ext5 or android-UpsideDownCake which fail building with androiddeployqt because build.gradle expects an integer only. This allows using string based versions and also fallbacks to setting an integer only value if it finds that the build.gradle of the project is still explicitly converting to integer (this to avoid breaking existing projects). Fixes: QTBUG-112465 Pick-to: 6.5 6.2 5.15 Change-Id: If8cfc0fb84f0880a43644dc0a4188671736d3e21 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Android: fix manual deployment with ANDROID_DEPLOYMENT_DEPENDENCIESAssam Boudjelthia2023-04-051-9/+21
| | | | | | | | | | | Fix the qtforandroid (i.e. libplugins_platforms_qtforandroid) check and avoid calling llvm-readobj on non-library files and only add them to the dependency list. Task-number: QTBUG-94232 Pick-to: 6.2 6.5 Change-Id: Id1a415b6d9834daaf5337e9bd15e7daf69fd574f Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Android: don't break when finding opengl pluginAssam Boudjelthia2023-04-051-1/+0
| | | | | | | | | | | | | avoid breaking when looking for the android plugin when the dependencies include opengl lib, since that was valid only in the early days where the Android plugin was separated into two raster and opengl. Now, that assumption is wrong and might affect the way the manual dependency works. Task-number: QTBUG-94232 Pick-to: 6.2 6.5 5.15 Change-Id: I025a5c8b2b064bb43a356a4ad5cb4a1ada41b09b Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Add description to cmake_automoc_parseAmir Masoud Abdol2023-04-031-0/+1
| | | | | | | | It was just missing, and was ending up being Qt cmake_automoc_parse. Pick-to: 6.5 Change-Id: I710e22bd86404d412dbf45aa960c924dd148fafc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* moc: Record types of enumerationsUlf Hermann2023-03-313-5/+17
| | | | | | | | | | | This will be helpful in a number of places, in particular in order to support enums of different sizes in QML. We record the type as string in the JSON output and as QMetaTypeInterface in the generated C++. Task-number: QTBUG-112180 Change-Id: I943fac67f8b25b013d3860301416cdd293c0c69e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qlalr: add option to error out on warningMårten Nordheim2023-03-313-4/+30
| | | | | | | | | | | | | By erroring out we can ensure that new warnings are not accidentally introduced and merged. As a drive-by: fix indentation of the --qt option. "--dot" needs three tabs, so "--qt" definitely needs it too. Fixes: QTBUG-108119 Change-Id: I56107c0744957293338080cf37350f1e1c743093 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* windeployqt: Make determineDebugAndDependentLibs more readableOliver Wolff2023-03-311-20/+35
| | | | | | Change-Id: Ib06fb5f2bce9afe1bd799c3ff96abff5ddb063a9 Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Windeployqt: prevent directory creation for dryrunsTimothée Keller2023-03-243-15/+17
| | | | | | | | | Added a check for dryruns when creating directories, to properly reflect expected behavior. Pick-to: 6.5 Change-Id: I72063e4d32302d304f8174701e38e275b404706b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: allow user set translation directoryYuhang Zhao2023-03-241-1/+9
| | | | | | | | | | Add the "translationdir" option, which allows the user to choose a different directory to deploy the translation files. Pick-to: 6.5 6.4 Change-Id: Iacf2031abb6d992e6765c02f232f81317b784720 Reviewed-by: Timothée Keller <timothee.keller@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Change android target SDK version to 31Fabio Falsini2023-03-211-1/+1
| | | | | | | | Play Store now accept only app with target SDK version set to 31 or above Change-Id: I7f7fb677798c3f2d3ce327226ac13a69f0bab442 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Centralize copyright information for QtKai Köhne2023-03-204-3/+5
| | | | | | | | | Maintain one central place - .cmake.conf - for information about Qt's copyright. Pick-to: 6.2 6.5 Change-Id: Ibcbce4313eba9660d459061b0ad00307e267b8f7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update Copyright year to 2023Kai Köhne2023-03-202-2/+2
| | | | | | Pick-to: 5.15 6.2 6.5 Change-Id: I8812bf2523ccb715407181aec6aebf2034c8ff84 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* moc: Allow anonymous propertiesUlf Hermann2023-03-165-185/+251
| | | | | | | | | | | | This is private for now. It's very handy to have anonymous properties for the QML model/delegate adaptors. There are models with only "singular" model data that doesn't have any sub-properties. Such model data should be available from the model object via an empty string as role. This way we can get rid of a lot of special casing. Task-number: QTBUG-104752 Change-Id: I229e355a7cab064ee1c9f89557bc0244a5d0c90a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Android: demistify the "No platform plugin" androiddeployqt errorAssam Boudjelthia2023-03-151-9/+4
| | | | | | | | | | | | | | | | | | | | | Make the error message clearly mention that a Qt for Android app require linking to Qt Gui library. Along the way get rid of the libqtforandroidGL mention which was valid when Qt for Android had separate plugins for raster and opengl, which was removed some time ago in 8a9bd001c947e6888d37e99fc456339fd2b51b36. Pick-to: 6.5 6.4 6.2 5.15 Task-number: QTBUG-111933 Task-number: QTBUG-111934 Task-number: QTBUG-108643 Task-number: QTBUG-97636 Task-number: QTBUG-83997 Fixes: QTBUG-85544 Task-number: QTBUG-93185 Change-Id: I24f6c08f619d805e0d82758d35aebaf32038206c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* androiddeployqt: remove infinity loop in deleteMissingFilesBartlomiej Moskal2023-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | There was a possibility of infinite loop and eventually crash when androiddeployqt was used for the second time. Everything because of deleteMissingFiles function for clean up previous build. When we find the same names and those are directories, we call recursively deleteMissingFiles. The parameters we use are absoluteDir, not absoluteFilePath. As we use parent of found dir, deleteMissingFiles is called with the same values as before. This commit removes possibility of infinite loop by using absoluteFilePath. That allows to avoid calling deleteMissingFiles with the same parameters. There is still a possibility, that directory that was found is not the same as we were looking for. That will cause not needed files removing, but those file will be copied again later. This regression was created by 7dc05252a0df829bb5ea3994160d425bb0da26cb commit Pick-to: 6.5 6.2 Fixes: QTBUG-111027 Change-Id: I195b4c407068b14e2ef94800ad1945adc66408cb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Utilize NO_UNITY_BUILD arguments instead of manual exclusionAmir Masoud Abdol2023-03-142-5/+3
| | | | | | | | | | | Unity build is disabled by default for all 3rdparty libraries, so we don't need to set the manually anymore; and for the plugins we can use NO_UNITY_BUILD instead. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ia2f83ae083924d31adf07e7647b34ae6571ed01f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* tracepointgen: fix inefficient loops, add a constMarc Mutz2023-03-141-5/+5
| | | | | | | | | | | | | | Take the loop variable by cref. Make one loop variable const that was ok to be taken by value. Coverity-Id: 404395 Coverity-Id: 404396 Coverity-Id: 404397 Coverity-Id: 404398 Coverity-Id: 404399 Pick-to: 6.5 Change-Id: Ib90a8f12b98c892314f10a9a3cb2f3c5c19a5d78 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* tracegen: fix inefficient loopsMarc Mutz2023-03-141-1/+1
| | | | | | | | | | | Take the loop variable by cref. Amends 83effb3a3f6bf73e682f7a9ccedebf4073ade776. Pick-to: 6.5 Coverity-Id: 404701 Change-Id: I1266dd1feb16b3842a93169e554a6563861f5a14 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* tracepointgen: fix inefficient loopsMarc Mutz2023-03-141-6/+6
| | | | | | | | | | | | Take the loop variable by cref, avoid some QList detaching. Coverity-Id: 404697 Coverity-Id: 404697 Coverity-Id: 404699 Coverity-Id: 404700 Pick-to: 6.5 Change-Id: I9fe7b6ad3cf87f442e6c111d6f661122ac23769c Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Doc: Remove duplicate wordsAndreas Eliasson2023-02-281-1/+1
| | | | | | Change-Id: Ia7a38a1035bd34d00f20351a0adc3927e473b2e7 Pick-to: 6.5 6.4 6.2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* uic: Add a -no-qt-namespace optionhjk2023-02-203-2/+10
| | | | | | | | | To suppress the generation of the Ui class within QT_BEGIN_NAMESPACE and QT_END_NAMESPACE. Change-Id: I6552b41d8e9eccb0475618d7ed7f7cea7f826625 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Add some exclusions for CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-162-1/+5
| | | | | | | | | | | | | Add exclusions for issues that are likely not fixable (3rd party code, X11 define clashes, etc) in 3rd party, tools and plugins. Pick-to: 6.5 Task-number: QTBUG-109394 Done-with: Amir Masoud Abdol <amir.abdol@qt.io> Change-Id: I698c004201a76a48389271c130e44fba20f5adf7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix syncqt.cpp build warningsAlexey Edelev2023-02-161-5/+5
| | | | | | | | | | Remove the deprecated timeStamp argument from the parseHeader function. Fix signed/unsigned comparison between file size and buffer size. User the correct oder when initializing variables. Pick-to: 6.5 Change-Id: I483cc175c9aaf42917053b6731833e1b4f5cad3a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update android deploy qt command line argument documentationNicholas Bennett2023-02-141-100/+6
| | | | | | | | | | | | The qdoc file now quotes from that main.cpp file, so this means the help information only needs to be maintained in main.cpp. Fixes: QTBUG-109178 Pick-to: 6.5 Change-Id: I5bb633f66d92c36593ec6b0aaf9cacd57d4ce352 Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Windeployqt: add custom qml output directory command line optionTimothée Keller2023-02-131-2/+14
| | | | | | | | | | | | | | | Added the qml-deploy-dir option, which deploys imported qml files to the directory passed as an argument. If no option is given, a "qml" directory is created, and files are deployed there. [ChangeLog][QtTools][Windeployqt] Windeployqt's default behavior is now to deploy qml imports to a "qml" directory inside the deploy directory, rather than directly to the deploy directory. Task-number: QTBUG-99516 Pick-to: 6.5 Change-Id: I49262a38c4a42ef20b05b603f5eb5393fe9cc218 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* src: Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-1015-139/+24
| | | | | | Pick-to: 6.5 Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* tracegen: Fix handling enumerators with duplicate valuesAntti Määttä2023-02-105-22/+72
| | | | | | | | | | Aggregate the names of the same value enumerators. The values can also be hexadecimal so handle them also. Pick-to: 6.5 Change-Id: I89693d7e3b8f6c051b298401dcbe8a9f5c0a38aa Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* tracegen: Add support for QSizeF and QRectF typesAntti Määttä2023-02-105-1/+29
| | | | | | | Pick-to: 6.5 Change-Id: Ie19523b84026312c3d5a597914abc2622dba3f68 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* CTF: Move event metadata generation to the wrapperAntti Määttä2023-02-107-117/+178
| | | | | | | | | | | This fixes the metadata generation when cross compiling. The metadata needs to be generated based on the type info of the target. Currently the metadata is generated in the tool based on the host type info. Task-number: QTBUG-110270 Pick-to: 6.5 Change-Id: Ibcdcbd690620afc532d6007cf036229342bdcc31 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Tracepointgen: Parse metadata from include filesAntti Määttä2023-02-103-7/+334
| | | | | | | | | | | | | | The tracepointgen tool needs to know the enumeration/flag names and values in order to generate metadata for the tracepoints in order to pass this information when tracing. Currently the metadata needs to be provided to the tracepointgen by hand. This implements metadata parsing from header files. Task-number: QTBUG-110598 Pick-to: 6.5 Change-Id: Ibb2cc6e724fd2defca4e301af2285b0fdbe8e7f7 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* qdbusxml2cpp: don't emit Q_DECL_DEPRECATED for the adaptorThiago Macieira2023-02-071-8/+1
| | | | | | | | | | | | | | | The adaptor is a server-side implementation that must exist anyway and is called by the QtDBus runtime. We don't want warning on the server side because it must call those methods to implement the client API. Since we have the XML introspection saved in a class property anyway, the runtime won't be inspecting the method tags to see if Q_DECL_DEPRECATED is there, to add to the XML (which it isn't generating). Pick-to: 6.5 Change-Id: I9671dee8ceb64aa9b9cafffd17416596135d26ca Reviewed-by: David Faure <david.faure@kdab.com>
* qdbusxml2cpp: invert Q_DECL_DEPRECATED and inline in the outputThiago Macieira2023-02-071-5/+7
| | | | | | | | | | | | | | | | Commit 93dad2bf91d414a41c6e2c7db6c75171b4917d4d (6.0) changed Q_DECL_DEPRECATED to use the [[deprecated]] attribute, which must appear before inline and other keywords. To keep it next to Q_NOREPLY, I also moved the "inline" into the next string. Added missing tests for both. Pick-to: 6.2 6.4 6.5 Fixes: QTBUG-110979 Change-Id: I9671dee8ceb64aa9b9cafffd1741656e86f40453 Reviewed-by: David Faure <david.faure@kdab.com>
View Lorry Controller Status