diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-20 19:31:49 +0200 |
| commit | bf43be097a90ed17b2807a4a7096b0a9f9c3fb8d (patch) | |
| tree | d4ef32b6eb9309e9556ebb70bf11bd4f9e33dd01 /src/multimedia | |
| parent | 2a939e540a70569ae917d12c4f0459077d0df8e7 (diff) | |
| parent | a0ee969c8d2f74382c0a8c9c77642d48a602577f (diff) | |
Merge 5.7 into 5.7.0
Change-Id: I7b8df058f300b1fa173679bb045f4c87dc736cd2
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index 2ea23e2ee..e3d3827c5 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -43,9 +43,6 @@ qhp.QtMultimedia.subprojects.examples.sortPages = true exampledirs += ../../../examples \ snippets -# Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtmultimedia - headerdirs += ../.. imagedirs += src/images \ |