diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 19:59:41 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 19:59:41 +0200 |
commit | c9ea9c5c40f6cbae237961f98e0a178ab412a2dd (patch) | |
tree | 9b81ad46a742b4804c23232e9ff1b308001e98a7 | |
parent | 91390c94412a1bebce4ace89070a33af3189701d (diff) | |
parent | 09169bf5114f133e6974b08437c11b9fc5710f1c (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I9e7b4db823c192cc8ba9766f2623b63d6c640a9c
-rw-r--r-- | examples/androidextras/notification/notification.pro | 3 | ||||
-rw-r--r-- | src/androidextras/doc/qtandroidextras.qdocconf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/examples/androidextras/notification/notification.pro b/examples/androidextras/notification/notification.pro index 5a26740..a3ce911 100644 --- a/examples/androidextras/notification/notification.pro +++ b/examples/androidextras/notification/notification.pro @@ -16,3 +16,6 @@ RESOURCES += \ HEADERS += \ notificationclient.h + +target.path = $$[QT_INSTALL_EXAMPLES]/androidextras/notification +INSTALLS += target diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf index 725284c..b42a391 100644 --- a/src/androidextras/doc/qtandroidextras.qdocconf +++ b/src/androidextras/doc/qtandroidextras.qdocconf @@ -35,7 +35,7 @@ exampledirs += ../../../examples/androidextras \ examples.fileextensions += *.java # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtandroidextras/androidextras +examplesinstallpath = androidextras imagedirs += images navigation.landingpage = "Qt Android Extras" |