aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmldirparser.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-01-21 08:08:30 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-01-21 08:08:30 +0000
commit872a05475721ad771bd347d1526035e6e7479d30 (patch)
tree5edd3e40174ef1379057ff9b1d2107e67e09bda1 /src/qml/qml/qqmldirparser.cpp
parentd68a7e04f2a0c01e087190a6171e7c37ffb0359d (diff)
parent81b3d791b5920832eefb616720bccf5cd386cd57 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/qml/qml/qqmldirparser.cpp')
0 files changed, 0 insertions, 0 deletions