aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into HEADLaszlo Agocs2016-05-241-0/+1
|\
| * qmlplugindump: Allow dumping of WebEngine pluginsKai Koehne2016-05-201-0/+1
* | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2016-05-243-16/+38
|\|
| * Fix qmlimportscanner to find Qt Quick Controls 2 stylesJ-P Nurmi2016-05-021-12/+34
| * QML: Fix qmlplugindump Info.plistErik Verbruggen2016-04-281-3/+3
| * qmlplugindump: skip "private" directories.Marco Benelli2016-04-281-1/+1
* | Remove opengldummyLaszlo Agocs2016-05-0914-6698/+0
* | Merge remote-tracking branch 'origin/dev' into wip/scenegraphngLaszlo Agocs2016-04-1325-1/+1473
|\|
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-0825-1/+1473
| |\
| | * Add benchmarks to the "make benchmark" targets that are known to workSimon Hausmann2016-03-171-2/+1
| | * qmltime: Remove deprecation define.Robin Burchell2016-03-151-2/+0
| | * Move qmltime out of benchmarks directory.Robin Burchell2016-03-1525-1/+1591
* | | Enable building Qt Quick module with QT_NO_OPENGL definedAndy Nichols2016-03-222-2/+7
* | | 2DRenderer: Change license to LGPLv3 or GPL2+ or CommercialAndy Nichols2016-03-092-18/+54
* | | Merge remote-tracking branch 'qtdeclarative-2drender/dev' into qtdeclarativeAndy Nichols2016-03-0814-0/+6662
|\ \ \ | |/ / |/| |
| * | Move OpenGL/EGL headers into 3rdparty folderAndy Nichols2015-11-2412-3/+3
| * | Update headers to pass license check testAndy Nichols2015-11-242-24/+26
| * | Add OpenGL dummy libraries to projectAndy Nichols2014-09-0214-0/+6660
| /
* | 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