diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
| commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
| tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /qmake/doc | |
| parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
| parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/qmake.qdocconf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/qmake/doc/qmake.qdocconf b/qmake/doc/qmake.qdocconf index 30ff856b80..3493a697f4 100644 --- a/qmake/doc/qmake.qdocconf +++ b/qmake/doc/qmake.qdocconf @@ -31,12 +31,10 @@ depends += \ qtassistant \ qtbluetooth \ qtconcurrent \ - qtcontacts \ qtcore \ qtdbus \ qtdoc \ qtdesigner \ - qtfeedback \ qtgraphicaleffects \ qtgui \ qthelp \ @@ -44,31 +42,21 @@ depends += \ qtlinguist \ qtlocation \ qtmultimedia \ - qtmultimediawidgets \ qtnetwork \ qtopengl \ - qtorganizer \ qtprintsupport \ - qtpublishsubscribe \ qtqml \ qtquick \ qtquickcontrols \ - qtquickcontrolsstyles \ qtquickdialogs \ - qtquicklayouts \ qtscript \ qtscripttools \ qtsensors \ qtserialport \ - qtserviceframework \ qtsql \ qtsvg \ - qtsysteminfo \ qttestlib \ qtuitools \ - qtversit \ - qtwebkit \ - qtwebkitexamples \ qtwidgets \ qtwinextras \ qtx11extras \ |