Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-13 | 2 | -1/+41 |
|\ | |||||
| * | Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake | The Qt Project | 2020-02-12 | 3 | -138/+179 |
| |\ | |||||
| * | | Use INSTALL_QMLDIR instead of Qt6_DIR for qmltypes properties | Leander Beernaert | 2020-02-12 | 1 | -1/+1 |
| * | | Add library mapping for QtShaderTools | Mårten Nordheim | 2020-02-12 | 1 | -0/+1 |
| * | | Add support for qt_helper_lib() | Leander Beernaert | 2020-02-12 | 1 | -0/+39 |
* | | | Merge remote-tracking branch 'origin/5.15' into dev | Liang Qi | 2020-02-13 | 2 | -1/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15 | Qt Forward Merge Bot | 2020-02-04 | 2 | -1/+2 |
| |\ \ | |||||
| | * | | Enable system locale to skip digit-grouping if configured to do so | Edward Welbourne | 2020-02-03 | 1 | -0/+1 |
| | * | | glgen: Fix compile error | Johan Klokkhammer Helsing | 2020-01-31 | 1 | -1/+1 |
* | | | | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-10 | 2 | -11/+55 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Use posixpath when generating relative path | Mårten Nordheim | 2020-02-07 | 1 | -1/+1 |
| * | | | Add necessities for qtquick3d | Mårten Nordheim | 2020-02-06 | 1 | -0/+1 |
| * | | | pro2cmake: Handle QT += core-private correctly for modules | Alexandru Croitor | 2020-02-05 | 1 | -10/+53 |
* | | | | Merge remote-tracking branch 'origin/wip/cmake' into dev | Alexandru Croitor | 2020-02-03 | 53 | -0/+9103 |
|\| | | | |||||
| * | | | pro2cmake: Fix flake and mypy issues | Alexandru Croitor | 2020-01-29 | 1 | -5/+5 |
| * | | | pro2cmake: Handle QML_IMPORT_MAJOR_VERSION and minor variants | Alexandru Croitor | 2020-01-29 | 1 | -0/+11 |
| * | | | Fix example generation without qmldir file | Leander Beernaert | 2020-01-28 | 1 | -4/+2 |
| * | | | pro2cmake: Don't set OUTPUT_NAME for qml plugins | Alexandru Croitor | 2020-01-27 | 1 | -2/+2 |
| * | | | Reformat pro2cmake | Alexandru Croitor | 2020-01-27 | 1 | -25/+23 |
| * | | | Fix plugin target names to be compatible with Qt 5 | Alexandru Croitor | 2020-01-27 | 1 | -6/+22 |
| * | | | Support for QML Type Registrar | Leander Beernaert | 2020-01-24 | 1 | -1/+36 |
| * | | | Merge remote-tracking branch 'origin/dev' into merge-dev | Leander Beernaert | 2020-01-24 | 13 | -69/+1278 |
| |\| | | |||||
| * | | | Run make format | Leander Beernaert | 2020-01-16 | 2 | -7/+3 |
| * | | | Do not set OUTPUT_DIRECTORY if it is already set | Leander Beernaert | 2020-01-16 | 1 | -2/+8 |
| * | | | Adjust OUTPUT_DIRECTORY for tests when targets starts with ../ | Leander Beernaert | 2020-01-14 | 1 | -0/+8 |
| * | | | Fix CMAKE_CROSSCOMPILING property name conversion | Leander Beernaert | 2020-01-13 | 1 | -1/+1 |
| * | | | Add library mappings for QtAxContainer and QtWekKitWidgets | Leander Beernaert | 2019-12-11 | 1 | -0/+6 |
| * | | | Add condition mapping for cross_compile to CMAKE_CROSS_COMPILING | Leander Beernaert | 2019-12-11 | 1 | -0/+2 |
| * | | | Add special condition replacement for libclang in qttools | Leander Beernaert | 2019-12-10 | 1 | -0/+3 |
| * | | | Add library mapping for QtTools | Leander Beernaert | 2019-12-09 | 1 | -0/+3 |
| * | | | Collect Json Metatypes from CMake's Automoc | Leander Beernaert | 2019-12-04 | 1 | -0/+2 |
| * | | | Export non-private and non-public features and CONFIG values | Alexandru Croitor | 2019-12-03 | 1 | -18/+72 |
| * | | | Add initial support for cross-building to iOS | Alexandru Croitor | 2019-12-03 | 1 | -0/+1 |
| * | | | pro2cmake: Format again | Alexandru Croitor | 2019-11-26 | 1 | -9/+5 |
| * | | | Post merge fixes | Leander Beernaert | 2019-11-25 | 2 | -4/+15 |
| * | | | Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake | The Qt Project | 2019-11-25 | 20 | -620/+2628 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/dev' into wip/cmake | Leander Beernaert | 2019-11-19 | 20 | -620/+2628 |
| | |\ \ \ | |||||
| * | | | | | Add FindWrapHarfbuzz | Alexandru Croitor | 2019-11-25 | 1 | -1/+1 |
| * | | | | | Add support for DYNAMIC_QMLDIR to pro2cmake | Leander Beernaert | 2019-11-25 | 1 | -50/+134 |
| * | | | | | Fix formatting in helper.py | Leander Beernaert | 2019-11-25 | 1 | -5/+9 |
| * | | | | | Fix pro2cmake formatting | Simon Hausmann | 2019-11-23 | 2 | -15/+12 |
| * | | | | | Add parts needed for QtQuick3D | Mårten Nordheim | 2019-11-22 | 1 | -6/+5 |
| |/ / / / | |||||
| * | | | | Add more special condition conversions | Leander Beernaert | 2019-11-14 | 1 | -0/+11 |
| * | | | | pro2cmake: Adjust script to generate new CMake API calls | Alexandru Croitor | 2019-11-14 | 1 | -15/+124 |
| * | | | | pro2cmake: Allow limiting the number of projects to convert | Alexandru Croitor | 2019-11-14 | 1 | -0/+17 |
| * | | | | pro2cmake: Fix generic_version_handler not to be greedy | Alexandru Croitor | 2019-11-13 | 1 | -1/+1 |
| * | | | | Allow passing args from run_pro2cmake to pro2cmake | Alexandru Croitor | 2019-11-13 | 1 | -3/+18 |
| * | | | | pro2cmake: Reformat code with black | Alexandru Croitor | 2019-11-13 | 2 | -1/+5 |
| * | | | | pro2cmake: If CONFIG-=app_bundle consider this a non gui app | Alexandru Croitor | 2019-11-13 | 1 | -1/+1 |
| * | | | | pro2cmake: Fix broken is_manual_test usage | Alexandru Croitor | 2019-11-13 | 1 | -2/+2 |