summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-132-1/+2
|\
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-042-1/+2
| |\
| | * Enable system locale to skip digit-grouping if configured to do soEdward Welbourne2020-02-031-0/+1
| | * glgen: Fix compile errorJohan Klokkhammer Helsing2020-01-311-1/+1
* | | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-02-102-11/+55
|\ \ \
| * | | Use posixpath when generating relative pathMårten Nordheim2020-02-071-1/+1
| * | | Add necessities for qtquick3dMårten Nordheim2020-02-061-0/+1
| * | | pro2cmake: Handle QT += core-private correctly for modulesAlexandru Croitor2020-02-051-10/+53
* | | | Merge remote-tracking branch 'origin/wip/cmake' into devAlexandru Croitor2020-02-0353-0/+9103
|\| | |
| * | | pro2cmake: Fix flake and mypy issuesAlexandru Croitor2020-01-291-5/+5
| * | | pro2cmake: Handle QML_IMPORT_MAJOR_VERSION and minor variantsAlexandru Croitor2020-01-291-0/+11
| * | | Fix example generation without qmldir fileLeander Beernaert2020-01-281-4/+2
| * | | pro2cmake: Don't set OUTPUT_NAME for qml pluginsAlexandru Croitor2020-01-271-2/+2
| * | | Reformat pro2cmakeAlexandru Croitor2020-01-271-25/+23
| * | | Fix plugin target names to be compatible with Qt 5Alexandru Croitor2020-01-271-6/+22
| * | | Support for QML Type RegistrarLeander Beernaert2020-01-241-1/+36
| * | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2413-69/+1278
| |\| |
| * | | Run make formatLeander Beernaert2020-01-162-7/+3
| * | | Do not set OUTPUT_DIRECTORY if it is already setLeander Beernaert2020-01-161-2/+8
| * | | Adjust OUTPUT_DIRECTORY for tests when targets starts with ../Leander Beernaert2020-01-141-0/+8
| * | | Fix CMAKE_CROSSCOMPILING property name conversionLeander Beernaert2020-01-131-1/+1
| * | | Add library mappings for QtAxContainer and QtWekKitWidgetsLeander Beernaert2019-12-111-0/+6
| * | | Add condition mapping for cross_compile to CMAKE_CROSS_COMPILINGLeander Beernaert2019-12-111-0/+2
| * | | Add special condition replacement for libclang in qttoolsLeander Beernaert2019-12-101-0/+3
| * | | Add library mapping for QtToolsLeander Beernaert2019-12-091-0/+3
| * | | Collect Json Metatypes from CMake's AutomocLeander Beernaert2019-12-041-0/+2
| * | | Export non-private and non-public features and CONFIG valuesAlexandru Croitor2019-12-031-18/+72
| * | | Add initial support for cross-building to iOSAlexandru Croitor2019-12-031-0/+1
| * | | pro2cmake: Format againAlexandru Croitor2019-11-261-9/+5
| * | | Post merge fixesLeander Beernaert2019-11-252-4/+15
| * | | Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmakeThe Qt Project2019-11-2520-620/+2628
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-1920-620/+2628
| | |\ \ \
| * | | | | Add FindWrapHarfbuzzAlexandru Croitor2019-11-251-1/+1
| * | | | | Add support for DYNAMIC_QMLDIR to pro2cmakeLeander Beernaert2019-11-251-50/+134
| * | | | | Fix formatting in helper.pyLeander Beernaert2019-11-251-5/+9
| * | | | | Fix pro2cmake formattingSimon Hausmann2019-11-232-15/+12
| * | | | | Add parts needed for QtQuick3DMårten Nordheim2019-11-221-6/+5
| |/ / / /
| * | | | Add more special condition conversionsLeander Beernaert2019-11-141-0/+11
| * | | | pro2cmake: Adjust script to generate new CMake API callsAlexandru Croitor2019-11-141-15/+124
| * | | | pro2cmake: Allow limiting the number of projects to convertAlexandru Croitor2019-11-141-0/+17
| * | | | pro2cmake: Fix generic_version_handler not to be greedyAlexandru Croitor2019-11-131-1/+1
| * | | | Allow passing args from run_pro2cmake to pro2cmakeAlexandru Croitor2019-11-131-3/+18
| * | | | pro2cmake: Reformat code with blackAlexandru Croitor2019-11-132-1/+5
| * | | | pro2cmake: If CONFIG-=app_bundle consider this a non gui appAlexandru Croitor2019-11-131-1/+1
| * | | | pro2cmake: Fix broken is_manual_test usageAlexandru Croitor2019-11-131-2/+2
| * | | | Add add_qt_manual_test()Leander Beernaert2019-11-121-1/+13
| * | | | pro2cmake: Consider _LOADED operations as always processedAlexandru Croitor2019-11-121-0/+1
| * | | | pro2cmake: Handle operation evaluation order when including childrenAlexandru Croitor2019-11-123-43/+167
| * | | | Add mapping entry for LinuxOfonoSupportLeander Beernaert2019-11-121-0/+3
| * | | | pro2cmake: Allow skipping subdirs projects via command lineAlexandru Croitor2019-11-122-0/+28