diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:56 +0100 |
| commit | dd4569940d69248f8bf3fa72dbebb57bb6ddd090 (patch) | |
| tree | 884ba3c26574bd4d6d9ae6fb91be7e779030d729 /src | |
| parent | f0fefa8766cb3cec38f39c31bb01860bea88dcbc (diff) | |
| parent | c826d6ab7f3058857de883eb605abdb399772c01 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I4497150a68daf85260a55a6539f5ed178b55a725
Diffstat (limited to 'src')
| -rw-r--r-- | src/androidextras/doc/qtandroidextras.qdocconf | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf index f6f7aeb..725284c 100644 --- a/src/androidextras/doc/qtandroidextras.qdocconf +++ b/src/androidextras/doc/qtandroidextras.qdocconf @@ -6,8 +6,6 @@ project = QtAndroidExtras description = Qt Android Extras Reference Documentation version = $QT_VERSION -examplesinstallpath = qtandroidextras - qhp.projects = QtAndroidExtras qhp.QtAndroidExtras.file = qtandroidextras.qhp @@ -37,7 +35,7 @@ exampledirs += ../../../examples/androidextras \ examples.fileextensions += *.java # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = androidextras +examplesinstallpath = qtandroidextras/androidextras imagedirs += images navigation.landingpage = "Qt Android Extras" |