diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:31:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:31:31 +0200 |
| commit | 0e526c1aa167ae81481ab3849dcc89f16ac55699 (patch) | |
| tree | 47f4caa06d500b55505314c49997c9b8407d7e83 /src | |
| parent | 509c7b7f7da2fd69444b7dba32f31db51ad40aa8 (diff) | |
| parent | ae58e100d3df71772db4f2f938d0a2ddc8a0873f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I2330fade4f257fc58a9906e98fc17da889ce62ea
Diffstat (limited to 'src')
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 00b45ac..39faeee 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -7,7 +7,7 @@ version = $QT_VERSION exampledirs += ../../../examples/macextras \ snippets -examplesinstallpath = qtmacextras/macextras +examplesinstallpath = macextras # Add a generic 'Qt Code Sample' thumbnail in Qt Creator for all examples manifestmeta.thumbnail.names += "QtMacExtras/*" |