diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:20 +0100 |
| commit | 5ca3040606c9dce1a410f1da059a501c03fc2cd9 (patch) | |
| tree | 2c260c2a37783426ae8516ef3a16cb74956342b5 | |
| parent | 6fc28d438aaac9723a8b40b87b6d77d6841d6dce (diff) | |
| parent | 1ff699ae47d14e39316a335ce897ca55a8ce6aad (diff) | |
| download | qtxmlpatterns-5ca3040606c9dce1a410f1da059a501c03fc2cd9.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I346e4a6c0b56a2730dfb90ac4629e2a621d2fe1f
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index fd6ca90..7407c12 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -15,7 +15,7 @@ imagedirs += images sourcedirs += .. \ ../../imports/xmllistmodel -depends += qtcore qtxml qtwidgets qtdesigner qtdoc qmake qtwebkitexamples +depends += qtcore qtxml qtwidgets qtdesigner qtdoc qmake qtquick qhp.projects = QtXmlPatterns |