aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-125-11/+158
|\
| * QuickTest, QmlImportScanner: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-02-101-8/+8
| * qmlplugindump: option to merge qmltypes.Marco Benelli2016-02-024-3/+150
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-291-13/+18
|\|
| * qmlimportscanner: do not use local predicates.Marco Benelli2016-01-281-13/+18
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devSimon Hausmann2016-01-221-2/+9
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2016-01-221-2/+9
| |\|
| | * qmlplugindump: avoid generating conflicting types.Marco Benelli2016-01-201-0/+7
| | * QmlPluginDump: use QFileInfo::exist(f) instead ofAnton Kudryavtsev2016-01-191-2/+2
* | | Don't build qmldebug or qmlprofiler on -no-qml-debugUlf Hermann2016-01-221-1/+3
|/ /
* | Updated license headersJani Heikkinen2016-01-2031-527/+372
* | Tools: fix expensive iteration over QHash::keys()Anton Kudryavtsev2016-01-152-7/+10
* | QtDeclarative: use prefix ++/-- for iterator typesAnton Kudryavtsev2016-01-091-2/+2
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-181-0/+8
|\|
| * qmlplugindump: Don't try to import Qt.test.qtestrootAlbert Astals Cid2015-12-151-0/+8
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-073-15/+47
|\|
| * QmlJs: separate dumping of Qt built-ins and QtQml.Marco Benelli2015-11-271-3/+37
| * Revert "qmlscene/qml tools: Temporarily disable High DPI options."Friedemann Kleint2015-11-262-12/+10
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-212-15/+30
|\|
| * qmlimportscanner: Improve command line help.Friedemann Kleint2015-11-161-6/+13
| * Proper handling of composite types with different versions.Marco Benelli2015-11-031-9/+17
* | Extend QDebugMessageServiceUlf Hermann2015-11-171-1/+5
* | QmlDebug: Restructure QPacket and QPacketProtocolUlf Hermann2015-11-171-1/+0
* | QmlProfiler: Remove "Source code not available"Ulf Hermann2015-11-051-3/+1
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-033-4/+12
|\|
| * qmlscene/qml tools: Temporarily disable High DPI options.Friedemann Kleint2015-11-022-0/+8
| * Remove uses of QT_POINTER_SIZE, replacing with proper constructsThiago Macieira2015-10-291-4/+4
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-261-0/+2
| |\
| | * qmlprofiler: Use server's datastream version for communicationUlf Hermann2015-10-151-0/+2
* | | Move QML profiler client to qmldebugUlf Hermann2015-10-307-326/+168
* | | QmlProfiler: Collect useful input eventsUlf Hermann2015-10-305-16/+62
* | | qmlprofiler: Use local socket connection by defaultUlf Hermann2015-10-302-14/+31
* | | Move QQmlDebugClient into separate static libraryUlf Hermann2015-10-306-534/+13
* | | QmlProfiler: Remove binding typesUlf Hermann2015-10-281-14/+2
* | | QmlProfiler: Fix lookup of type stringsUlf Hermann2015-10-281-2/+2
* | | Merge remote-tracking branch 'origin/5.6' into origin/devUlf Hermann2015-10-222-35/+69
|\| |
| * | qmlscene: Split argument parsing.Friedemann Kleint2015-10-191-31/+38
| * | Skip designer-related directories while scanning imports.Marco Benelli2015-10-191-4/+31
* | | Use QStringRef in a bunch of places.wip/dbusSérgio Martins2015-10-181-1/+1
* | | qmlprofiler: Clear trace client when trace is finishedUlf Hermann2015-10-151-0/+4
* | | qmlprofiler: Simplify QmlProfilerClientUlf Hermann2015-10-154-84/+32
* | | Put QPacketProtocol into its own static libraryUlf Hermann2015-10-154-644/+8
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-149-36/+42
|\| |
| * | Tools: Fix single-character string literals.Friedemann Kleint2015-10-139-26/+31
| * | Make QML composite types inherit attached propertiesJ-P Nurmi2015-10-091-10/+11
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-09-254-19/+43
|\| |
| * | qmlplugindump: Drop '.exe' suffix in commentKai Koehne2015-09-231-1/+1
| * | qmlscene: Make it possible to pass non-local file URLs.Friedemann Kleint2015-09-221-16/+34
| * | Convert FunctionObjects to new allocation syntaxLars Knoll2015-09-221-2/+2
| * | Inline property data into the objectLars Knoll2015-09-221-1/+1