aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Disentangle some includes by moving QQmlJS::Directives into qqmljsengine_p.hLars Knoll2018-04-251-0/+1
* Merge remote-tracking branch 'origin/5.11' into devUlf Hermann2018-04-091-1/+1
|\
| * Fix debug-and-release builds with CONFIG += qtquickcompilerSimon Hausmann2018-03-311-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-03-282-1/+2
|\|
| * Fix CONFIG+=qtquickcompiler with paths that contain spacesSimon Hausmann2018-03-271-0/+1
| * qtquick_compiler_add_resources() with spaces in pathsSimon Hausmann2018-03-271-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-03-211-3/+11
|\|
| * Fix CONFIG+=qtquickcompiler with Q_CLEANUP_RESOURCESimon Hausmann2018-03-191-3/+11
* | QQmlDebugClient: Make stateChanged a signalUlf Hermann2018-03-202-2/+4
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-151-6/+6
|\|
| * Fix use of CONFIG+=qtquickcompiler with spaces in pathsSimon Hausmann2018-03-141-6/+6
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-02-2710-52/+36
|\|
| * init variables where they are declared when possible (clang-tidy)Shawn Rutledge2018-02-262-33/+17
| * use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-2610-19/+19
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-201-1/+1
|\|
| * qmlcachegen: fix error messages for js filesMitch Curtis2018-02-201-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-172-0/+78
|\|
| * Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into refs/stag...Qt Forward Merge Bot2018-02-152-0/+19
| |\
| * | Add support for qtquick_compiler_add_resources with cmake buildsSimon Hausmann2018-02-152-0/+78
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-152-0/+19
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-122-0/+19
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-052-0/+19
| | |\
| | | * qmlprofiler tool: In attach mode, finish when connection dropsUlf Hermann2018-02-022-0/+19
* | | | Add a feature for qml-animationUlf Hermann2018-02-152-3/+5
* | | | Add a feature for qmldevtoolsUlf Hermann2018-02-091-8/+13
* | | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-083-21/+28
|\| | |
| * | | Fix CONFIG+=qtquickcompiler with multiple resource filesSimon Hausmann2018-02-083-21/+28
* | | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-081-4/+2
|\| | |
| * | | Use qmlcachegen path from qtPrepareToolSamuli Piippo2018-02-081-4/+2
* | | | qmlprofiler tool: Fix message in interactive modeUlf Hermann2018-02-071-1/+5
|/ / /
* | | Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging...Shawn Rutledge2018-02-062-5/+23
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-02-022-5/+23
| |\| |
| | * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-242-6/+29
| | |\|
| | | * Fix illegal name setup in qmlcachegenSimon Hausmann2018-01-181-0/+2
| | | * Use a more optimized lookup for global propertiesLars Knoll2018-01-171-3/+19
| | | * Use potentially intercepted URL as ID for compilation unitsUlf Hermann2017-12-211-3/+10
| | | * Add logging categories for GC statisticsLars Knoll2017-12-111-2/+0
* | | | Use better QmlProfiler client from Qt CreatorUlf Hermann2018-02-026-588/+387
|/ / /
* | | Remove private API dependency of qmlcachegen generated codeSimon Hausmann2018-01-282-11/+1
* | | Add support for compiling QML/JS files ahead of time in resourcesSimon Hausmann2018-01-287-10/+1074
* | | Minor data structure cleanupSimon Hausmann2018-01-222-39/+5
* | | Fix build for QML modules with qmlcache config enabledJ-P Nurmi2017-12-082-11/+4
* | | Merge remote-tracking branch 'origin/wip/new-backend' into devSimon Hausmann2017-11-212-145/+76
|\ \ \
| * | | V4: Add a baseline JITErik Verbruggen2017-11-171-0/+2
| * | | Merge remote-tracking branch 'origin/dev' into new-backendLars Knoll2017-11-082-6/+26
| |\| |
| * | | Merge remote-tracking branch 'origin/dev' into HEADLars Knoll2017-10-223-2/+38
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/dev' into wip/new-backendSimon Hausmann2017-09-083-3/+23
| |\ \ \ \
| * | | | | Move CallContext construction into a interpreter instructionLars Knoll2017-09-011-1/+1
| * | | | | Merge remote-tracking branch 'origin/dev' into wip/new-backendLars Knoll2017-08-2214-151/+85
| |\ \ \ \ \
| * | | | | | Fix compilationLars Knoll2017-08-081-1/+1