aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-1/+1
|\
| * qmlplugindump: update QtQuick references to 2.8Marco Benelli2016-09-121-1/+1
* | tools: use const (and const APIs) moreAnton Kudryavtsev2016-08-226-28/+28
* | tools: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-224-16/+26
|/
* tools: replace 'foreach' with 'range for'Anton Kudryavtsev2016-08-2010-53/+53
* Adjust decarative after qtConfig changes in qtbaseLars Knoll2016-08-191-1/+1
* qmlimportscanner: fix MSVC buildAnton Kudryavtsev2016-08-181-32/+40
* qmlimportscanner: use QStringLiteral more judiciouslyAnton Kudryavtsev2016-08-181-2/+2
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-171-1/+1
|\
| * qmlplugindump: fix regexp for plugins.qmltypesJ-P Nurmi2016-08-091-1/+1
* | Do not override QT_QPA_PLATFORM env variablesAndreas Cord-Landwehr2016-08-161-1/+1
* | tools: use QStringRef moreAnton Kudryavtsev2016-08-124-14/+12
* | SplineEditor: replace QList with QVectorAnton Kudryavtsev2016-08-111-3/+4
* | Qt object: Add exit(int)Cavit Sina Dogru2016-08-092-3/+15
* | Remove dead codeSimon Hausmann2016-08-092-370/+0
* | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-021-1/+1
|\|
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-1/+1
| |\
| | * Fix build on macOS with ICC: -sectcreate is a linker optionThiago Macieira2016-07-241-1/+1
* | | Tooling: Convert connects to Qt5 styleUlf Hermann2016-07-285-28/+30
* | | Don't set QT_QML_DEBUG_NO_WARNING on -no-qml-debugUlf Hermann2016-07-262-2/+3
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-301-1/+2
|\| |
| * | qmlplugindump: Avoid warnings about missing createPlatformOpenGLContextKai Koehne2016-06-291-1/+2
* | | V4: Pass scope around as parameters inside the runtime.Erik Verbruggen2016-06-221-4/+4
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-8/+23
|\| |
| * | qmlplugindump: add a command line option.Marco Benelli2016-05-251-8/+23
* | | 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
| |\|