aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-1232-266/+681
|\
| * Remove leftover qgl.h includeAlexandru Croitor2020-03-101-3/+0
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-0912-27/+29
| |\
| | * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-024-4/+4
| | * Restore offset/length in QQmlJS::DiagnosticMessageSimon Hausmann2020-03-029-23/+25
| * | Fix build without commandlineparser and temporaryfileTasuku Suzuki2020-03-041-2/+2
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-215-37/+81
| |\|
| | * Tools: Convert to static type registrationsUlf Hermann2020-02-205-37/+81
| * | Add major version to all Q_REVISIONsUlf Hermann2020-02-191-0/+2
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-176-3/+77
| |\|
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-131-2/+2
| | |\
| | | * Remove /get from CMAKE_QML_DIRAndré Klitzing2020-02-111-2/+2
| | * | qmlformat: preserve annotationsFawzi Mohamed2020-02-122-0/+47
| | * | Add QML_CORE_PROFILE support to QML toolThomas Hartmann2020-02-062-1/+14
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-061-0/+1
| | |\|
| | | * Run qtEnsurePluginResourcesCpp() from qtquickcompiler.prfUlf Hermann2020-01-301-0/+1
| | * | Add support for file selectors to qml toolThomas Hartmann2020-02-041-0/+13
| * | | qmlformat: Enforce more of the coding conventionsMaximilian Goldstein2020-02-121-1/+54
| * | | Use QTypeRevision for all versions and revisionsUlf Hermann2020-02-039-93/+107
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-315-101/+330
| |\| |
| | * | qmlformat: Support even more language featuresMaximilian Goldstein2020-01-305-101/+330
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-298-43/+142
|\| | |
| * | | Quick: Don't qualify OpenGL includesUlf Hermann2020-01-271-1/+1
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-251-0/+10
| |\| |
| | * | CMake: Add Qt6 forward compatible CMake APIAlexandru Croitor2020-01-241-0/+10
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-211-25/+26
| |\| |
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-201-25/+26
| | |\|
| | | * qml: Fix options that need to be set before QApplication instantiationFriedemann Kleint2020-01-151-25/+26
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-205-17/+105
| |\| |
| | * | Replace QVariant::type with QVariant::userTypeOlivier Goffart2020-01-171-1/+1
| | * | qmlformat: Fix some language features being unsupportedMaximilian Goldstein2020-01-173-15/+103
| | * | QQmlListProperty: Add replace and removeLast functionsUlf Hermann2020-01-151-1/+1
* | | | Post merge fixesLeander Beernaert2020-01-247-46/+12
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2020-01-1633-2582/+3688
|\| | |
| * | | Remove qmlminUlf Hermann2020-01-153-709/+1
| * | | Make QtQml work with the latest changes in qtbaseLars Knoll2020-01-141-3/+3
| * | | Adapt to the removal of QObject::staticQtMetaObjectOlivier Goffart2020-01-141-10/+1
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-1420-238/+2629
| |\| |
| | * | qmllint: Consider failure to find imports an errorUlf Hermann2020-01-131-0/+1
| | * | qmllint: Consider attached propertiesUlf Hermann2020-01-131-0/+10
| | * | qmllint: parse simple type assertionsUlf Hermann2020-01-134-9/+46
| | * | qmllint: Assume "parent" property is always document parentUlf Hermann2020-01-133-0/+12
| | * | qmllint: Resolve aliasesUlf Hermann2020-01-137-128/+272
| | * | qmllint: Analyze member accessUlf Hermann2020-01-136-77/+290
| | * | qmlformat: Fix default construction of CommentUlf Hermann2020-01-101-2/+2
| | * | qmllint: parse JS files for methodsUlf Hermann2020-01-102-140/+196
| | * | qmllint: Clean up access to m_exportedName2ScopeUlf Hermann2020-01-101-11/+12
| | * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2020-01-092-2/+3
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-092-2/+3
| | | |\|
| | | | * Use the correct icon filename for QML Runtime on WindowsShawn Rutledge2020-01-011-1/+1