From 230db034cfee83cdb0fe583d21fe3ad93a4aa11c Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Sat, 16 Jun 2018 10:41:04 +0200
Subject: [PATCH] Build demo examples directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The directory will host more demos in the future so it is
wise to enable CI to build it and report issues, if any.
Change-Id: I97fbe8fc7589ec2c18e1dcb32c02a40332f9453b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
examples/demos/coffee/coffee.pro | 3 +--
examples/demos/demos.pro | 6 ++++++
examples/examples.pro | 4 ++++
qtdoc.pro | 5 +++--
4 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 examples/demos/demos.pro
create mode 100644 examples/examples.pro
diff --git a/examples/demos/coffee/coffee.pro b/examples/demos/coffee/coffee.pro
index 0c9dce00..369b8be4 100644
--- a/examples/demos/coffee/coffee.pro
+++ b/examples/demos/coffee/coffee.pro
@@ -23,9 +23,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
+else: win32|if(unix:!android): target.path = $$[QT_INSTALL_EXAMPLES]/demos/$${TARGET}
!isEmpty(target.path): INSTALLS += target
DISTFILES += \
diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro
new file mode 100644
index 00000000..ded286f0
--- /dev/null
+++ b/examples/demos/demos.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+qtHaveModule(quick) {
+ SUBDIRS += coffee
+}
+
diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644
index 00000000..e959b132
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = demos
+
diff --git a/qtdoc.pro b/qtdoc.pro
index d0012442..14c8c21d 100644
--- a/qtdoc.pro
+++ b/qtdoc.pro
@@ -1,2 +1,3 @@
-TEMPLATE = subdirs
-SUBDIRS = doc
+load(qt_parts)
+
+SUBDIRS += doc
--
GitLab