Merge branch 'dev' into stable

Change-Id: Ia3862e686c17c11cd7415cd657d442e4ac8c7002

1 files changed, 20 insertions, 0 deletions

diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri
new file mode 100644
index 0000000..b785913
--- /dev/null
+++ b/basicsuite/shared/shared.pri
@@ -0,0 +1,20 @@
+QT += quick
+
+DESTPATH = /data/user/$$TARGET
+target.path = $$DESTPATH
+
+SOURCES += $$PWD/main.cpp \
+           $$PWD/engine.cpp
+
+HEADERS += $$PWD/engine.h
+
+defineTest(b2qtdemo_deploy_defaults) {
+    commonFiles.files = \
+                        exclude.txt \
+                        ../shared/loader.qml
+    commonFiles.path = $$DESTPATH
+    OTHER_FILES += $${commonFiles.files}
+    INSTALLS += commonFiles
+    export(OTHER_FILES)
+    export(INSTALLS)
+}