summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2017-01-03 11:07:18 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2017-01-05 10:08:15 +0000
commitc3ee845db74f540603aada8df7dccd680889f7bb (patch)
tree95d7e9168c5368656e607cecbcdda471745859d6 /examples
parent6541025ebc76bafdcdb38da5c05708df14406396 (diff)
Add .pro files for example subdirectories
Instead of adding individual example projects into SUBDIRS from the top-level examples.pro, add a .pro file for both /examples/webengine and /examples/webenginewidgets that handles them. This way, it's easier to e.g. build all webengine examples from binary packages, as the top-level examples.pro is not packaged. Task-number: QTBUG-57124 Change-Id: I8cf8ac7b13b86306b31bc43c79e3d8272193b1d3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro26
-rw-r--r--examples/webengine/webengine.pro6
-rw-r--r--examples/webenginewidgets/webenginewidgets.pro17
3 files changed, 25 insertions, 24 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 1a0f3a263..3dac9b0b7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,27 +1,5 @@
TEMPLATE=subdirs
-qtHaveModule(webengine) {
- SUBDIRS += \
- webengine/customdialogs \
- webengine/minimal \
- webengine/quicknanobrowser
-}
+qtHaveModule(webengine): SUBDIRS += webengine
-qtHaveModule(webenginewidgets) {
- SUBDIRS += \
- webenginewidgets/minimal \
- webenginewidgets/contentmanipulation \
- webenginewidgets/cookiebrowser \
- webenginewidgets/demobrowser \
- webenginewidgets/markdowneditor \
- webenginewidgets/simplebrowser
-
- contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
- !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
- SUBDIRS += webenginewidgets/spellchecker
- } else {
- message("Spellcheck example will not be built because it depends on usage of Hunspell dictionaries.")
- }
- }
-
-}
+qtHaveModule(webenginewidgets): SUBDIRS += webenginewidgets
diff --git a/examples/webengine/webengine.pro b/examples/webengine/webengine.pro
new file mode 100644
index 000000000..969681e9d
--- /dev/null
+++ b/examples/webengine/webengine.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+
+SUBDIRS += \
+ customdialogs \
+ minimal \
+ quicknanobrowser
diff --git a/examples/webenginewidgets/webenginewidgets.pro b/examples/webenginewidgets/webenginewidgets.pro
new file mode 100644
index 000000000..353104d6a
--- /dev/null
+++ b/examples/webenginewidgets/webenginewidgets.pro
@@ -0,0 +1,17 @@
+TEMPLATE=subdirs
+
+SUBDIRS += \
+ minimal \
+ contentmanipulation \
+ cookiebrowser \
+ demobrowser \
+ markdowneditor \
+ simplebrowser
+
+contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
+ !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
+ SUBDIRS += spellchecker
+ } else {
+ message("Spellcheck example will not be built because it depends on usage of Hunspell dictionaries.")
+ }
+}