diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:07:41 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:07:49 +0200 |
commit | a0ee969c8d2f74382c0a8c9c77642d48a602577f (patch) | |
tree | 3b60a19041a3ae0cb896e9bd37c9277f2aa7fcc0 /src/multimedia | |
parent | 47e583a6b82a6b678f2ca2a621176ad40eeab95d (diff) | |
parent | 9ee131c416eb3a876c4072a29976cc56623aabc7 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib95ddbbc6e2b69663597cae045ec81eda6d12d58
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 \ |