aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | * Fix usage of qtquickcompiler.prf after lrelease.prfJoerg Bornemann2019-12-171-1/+2
| | * | | qmlformat/dumpastvisitor: Fix a few segfaultsMaximilian Goldstein2020-01-091-3/+8
| | |/ /
| | * | qmlformat: Fix whitespace for parameter defaultsMaximilian Goldstein2020-01-082-5/+5
| | * | tools/qmlformat: Improve formatting quite a bitMaximilian Goldstein2019-12-203-18/+72
| | * | qtdeclarative/tools: Implement qmlformatMaximilian Goldstein2019-12-199-1/+1862
| | * | Fix Qt6 build in preparation of qt5 submodule updateAlexandru Croitor2019-12-191-2/+2
| | * | Avoid deprecated non-q-prefixed hex() functionUlf Hermann2019-12-171-1/+1
| | * | qmllint: Use QHash::insert(QHash)Liang Qi2019-12-161-5/+1
| * | | Fix build without features.commandlineparserTasuku Suzuki2019-12-271-2/+1
| * | | Fix -no-gui build on macOSTasuku Suzuki2019-12-271-1/+1
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-141-1/+5
| |\| |
| | * | qmllint: Avoid QHash::unite()Ulf Hermann2019-12-131-1/+5
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-1216-1727/+1156
| |\| |
| | * | qmllint: Handle unversioned import statements in qmldir filesUlf Hermann2019-12-112-7/+19
| | * | qmllint: Read app.qmltypes files for extra type resolutionUlf Hermann2019-11-182-74/+113
| | * | qmllint: Remove special cases for Component, QtObject, and ConnectionsUlf Hermann2019-11-181-16/+0
| | * | qmllint: CleanupUlf Hermann2019-11-1816-1659/+1053
* | | | Post Merge FixesLeander Beernaert2019-11-256-4/+22
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-2513-47/+83
|\| | |
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-119-1167/+8
| |\| |
| | * | Move qmltyperegistrar into srcUlf Hermann2019-11-089-1170/+8