diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:46:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:56:44 +0100 |
| commit | 40a50c0c585eaa838261742e33a547e09d4040d6 (patch) | |
| tree | fc3e9933f4d0b0bbd6c31f3530d86b2caef93cdb /src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp | |
| parent | 9e26cfa167778f3d9444aedcb23c8476683b3785 (diff) | |
| parent | b257f032350c555ea52a7dad5a52d0312ab93b5c (diff) | |
| download | qtxmlpatterns-40a50c0c585eaa838261742e33a547e09d4040d6.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: I03793037d5cb382a3ea411286633903e4fee60ce
Diffstat (limited to 'src/xmlpatterns/functions/qconstructorfunctionsfactory.cpp')
0 files changed, 0 insertions, 0 deletions