diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:18:15 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:18:16 +0200 |
commit | ded45fc4fe53c443f1be92394fd2c836af4a4930 (patch) | |
tree | ff3ae7d784091b4d5c4ffb5670d8aea2d094416c | |
parent | bdaea37070f420bea13a34081e56db1ee792d040 (diff) | |
parent | b052dcaf308d761fa8df39a09f0296b808c928b5 (diff) |
Merge 5.6 into 5.6.1
Change-Id: I96aa7487c341f40c74832f00bc72995d25969329
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/cookiebrowser.pro | 3 | ||||
-rw-r--r-- | examples/webenginewidgets/demobrowser/demobrowser.pro | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro index 66ea064ef..6b249cf59 100644 --- a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro +++ b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro @@ -17,3 +17,6 @@ FORMS += \ RESOURCES += \ cookiebrowser.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/cookiebrowser +INSTALLS += target diff --git a/examples/webenginewidgets/demobrowser/demobrowser.pro b/examples/webenginewidgets/demobrowser/demobrowser.pro index 113eeb40e..dd5cb8006 100644 --- a/examples/webenginewidgets/demobrowser/demobrowser.pro +++ b/examples/webenginewidgets/demobrowser/demobrowser.pro @@ -80,7 +80,9 @@ mac { TARGET = Demobrowser } -EXAMPLE_FILES = Info_mac.plist demobrowser.icns demobrowser.ico demobrowser.rc +EXAMPLE_FILES = \ + Info_mac.plist demobrowser.icns demobrowser.ico demobrowser.rc \ + cookiejar.h cookiejar.cpp # FIXME: these are currently unused. # install target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/demobrowser |