summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into devUlf Hermann2018-06-253-9/+63
|\
| * CMake: fix bad argument quoting when calling rccRolf Eike Beer2018-06-191-1/+1
| * qmlcachegen: Remove superfluous semicolons from generated codeJoerg Bornemann2018-06-191-2/+2
| * Fix CONFIG+=qtquickcompiler with umlauts in the file pathSimon Hausmann2018-06-191-6/+48
| * Fix support for QTQUICK_COMPILER_SKIPPED_RESOURCESSimon Hausmann2018-06-191-0/+12
* | Re-add support for --jit and --interpret to qmljsSimon Hausmann2018-06-211-0/+9
* | Merge remote-tracking branch 'origin/5.11' into devSimon Hausmann2018-06-191-2/+2
|\ \ | |/
| * CMake: avoid x${var} tricksRolf Eike Beer2018-06-081-1/+1
| * CMake: replace deprecated exec_program() with execute_process()Rolf Eike Beer2018-06-081-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-05-151-1/+1
|\ \ | |/
| * Fix .import within .js files with CONFIG+=qtquickcompilerSimon Hausmann2018-05-111-1/+1
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-05-111-1/+1
|\ \ | |/
| * Fix build without features.xmlstreamwriterTasuku Suzuki2018-05-101-1/+1
* | Rename the CompilationMode enum to ContextTypeLars Knoll2018-05-022-2/+2
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging...Liang Qi2018-04-265-65/+60
|\ \
| * \ Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-265-65/+60
| |\ \ | | |/
| | * Make QtQmlDebug independent of QtQmlUlf Hermann2018-04-245-65/+60
* | | Clean up manual reference of QQmlTypeData and QQmlPropertyCacheSimon Hausmann2018-04-261-2/+2
|/ /
* | Bring JS grammar in line with ES7 specLars Knoll2018-04-251-39/+65
* | 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
|\ \ \