summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update submodules on 'wip/qt6' in qt5wip/qt6Liang Qi4 days2-0/+0
* Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Liang Qi4 days161-2168/+4919
|\
| * Merge remote-tracking branch 'origin/dev' into wip/qt6Liang Qi4 days161-2168/+4919
| |\ |/ /
| * Update submodules on 'dev' in qt5devLiang Qi10 days44-0/+0
| * platform_configs: replace -qt-xcb with -xcbGatis Paeglis2019-08-261-1/+1
| * Add QtQuick3D as a submodule in qt5.gitChristian Strømme2019-08-262-0/+6
| * Update submodules on 'dev' in qt5Qt Submodule Update Bot2019-08-2320-0/+0
| * Android: Update Android NDK to version r20BogDan Vatra2019-08-226-15/+15
| * Merge "Merge remote-tracking branch 'origin/5.13' into dev"Liang Qi2019-08-21154-2185/+4933
| |\
| | * Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-08-20154-2185/+4933
| | |\ | |/ /
| | * Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-1415-0/+0
| | * Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Liang Qi2019-08-141-1/+1
| | |\
| | | * Merge remote-tracking branch 'origin/5.13.1' into 5.13Liang Qi2019-08-131-1/+1
| | | |\ | | |/ /
| | | * Provisioning: Append the emscripten to path instead of prependSimo Fält2019-08-121-1/+1
| | | * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-124-0/+0
| | * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-112-0/+0
| | * | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-099-0/+0
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Liang Qi2019-08-094-4/+30
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Liang Qi2019-08-094-4/+30
| | | |\ \ | | |/ / / | | | | _
| | | * Include QtWebEngine againLiang Qi2019-08-081-1/+1
| | | * Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-083-0/+0
| | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1"Liang Qi2019-08-084-3/+29
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12' into 5.13.1Liang Qi2019-08-084-3/+29
| | | | |\ | | | |/ /
| | | | * Include qtvirtualkeyboard againLiang Qi2019-08-081-1/+1
| | | | * Partially revert 'Do DeveloperBuild for Boot2Qt'Tony Sarajärvi2019-08-083-2/+28
| | | | * Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-08-088-0/+0
| | | * | Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-075-0/+0
| | | * | Update submodules on '5.13.1' in qt5Qt Submodule Update Bot2019-08-0734-0/+0
| | | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1"Liang Qi2019-08-07134-2125/+4640
| | | |\ \
| | | | * \ Merge remote-tracking branch 'origin/5.13' into 5.13.1Liang Qi2019-08-06134-2125/+4640
| | | | |\ \ | | | |/ / /
| | | * | | Adjust submodule branchesFrederik Gladhorn2019-07-291-40/+40
| | * | | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-080-0/+0
| | * | | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-080-0/+0
| | | |/ / | | |/| |
| | * | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-063-0/+0
| | * | | Update submodules on '5.13' in qt5Qt Submodule Update Bot2019-08-053-0/+0
| | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-08-0532-0/+918
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0432-0/+918
| | | |\ \ \ | | |/ / / / | | | | | _
| | | * | Add macOS 10.14 to the CITony Sarajärvi2019-08-0332-0/+918
| | * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-08-0397-2108/+3558
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-08-0397-2108/+3558
| | | |\ \ \ | | |/ / / / | | | | _ / | | | | /
| | | * | Provisioning: update conan_manifests for libxslt packagesKonstantin Tokarev2019-08-017-48/+40
| | | * | Update platform_configs for QtWebKitKonstantin Tokarev2019-08-011-7/+1
| | | * | Remove 'Packaging' feature from WinRT_10 x86Jani Heikkinen2019-08-011-1/+1
| | | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-317-0/+0
| | | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-284-0/+0
| | | * | Provisioning: update Conan and Conan packagesKonstantin Tokarev2019-07-2661-1941/+2925
| | | * | Provisioning: Add CompilerException and CompilerThreads settings for ConanKonstantin Tokarev2019-07-261-3/+13
| | | * | Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming conventionKonstantin Tokarev2019-07-264-3/+3
| | | * | Conan: Suppress output of New-ItemKonstantin Tokarev2019-07-261-1/+1
| | | * | Update submodules on '5.12' in qt5Qt Submodule Update Bot2019-07-262-0/+0