diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:26:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:26:32 +0200 |
commit | 09169bf5114f133e6974b08437c11b9fc5710f1c (patch) | |
tree | 57ce6396b7ffa66bb1236c5deb71e0c3b0024e51 | |
parent | 368b0bbf2b2854547cfafa7092361f09dd157fb1 (diff) | |
parent | b0e7ac4227c04b3d9a3f90bb6203d3845d13e131 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I324ee61f7627de76bcc3765fe18fa009166fe5b5
-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" |