summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-05-12 11:18:15 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-05-12 11:18:16 +0200
commitded45fc4fe53c443f1be92394fd2c836af4a4930 (patch)
treeff3ae7d784091b4d5c4ffb5670d8aea2d094416c
parentbdaea37070f420bea13a34081e56db1ee792d040 (diff)
parentb052dcaf308d761fa8df39a09f0296b808c928b5 (diff)
Merge 5.6 into 5.6.1
-rw-r--r--examples/webenginewidgets/cookiebrowser/cookiebrowser.pro3
-rw-r--r--examples/webenginewidgets/demobrowser/demobrowser.pro4
2 files changed, 6 insertions, 1 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro b/examples/webenginewidgets/cookiebrowser/cookiebrowser.pro
index 66ea064e..6b249cf5 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 113eeb40..dd5cb800 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