summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-09-08 06:45:01 +0200
committerPaul Wicking <paul.wicking@qt.io>2020-09-14 15:01:53 +0200
commitc919245f12a0c74dc83f03fe09507a34e03f7cb5 (patch)
treeb7a2b42f5a082ae1634e17fe86c8207786244d7c /src/sql
parent6bb70ce1489072a21b8adcc5415d4f1ff7553df0 (diff)
Doc: Compile snippets only when running tests
Turn snippets projects into subdirs with libraries to avoid messy dependencies. Fixes: QTBUG-86497 Change-Id: Idb2c43f97d56c9b8d9992617ef716bde40fff5b7 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit 00d9a0ea8e0796a4ebf19ea15550d66adcf1af86) Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/doc/snippets/code/code.pro11
-rw-r--r--src/sql/doc/snippets/snippets.pro20
-rw-r--r--src/sql/doc/snippets/sqldatabase/sqldatabase.pro6
3 files changed, 25 insertions, 12 deletions
diff --git a/src/sql/doc/snippets/code/code.pro b/src/sql/doc/snippets/code/code.pro
new file mode 100644
index 0000000000..0ddb9d2ce4
--- /dev/null
+++ b/src/sql/doc/snippets/code/code.pro
@@ -0,0 +1,11 @@
+TEMPLATE = lib
+TARGET = code_snippets
+QT = core sql
+
+SOURCES = \
+ doc_src_sql-driver.cpp \
+ src_sql_kernel_qsqldatabase.cpp \
+ src_sql_kernel_qsqlerror.cpp \
+ src_sql_kernel_qsqlresult.cpp \
+ src_sql_kernel_qsqldriver.cpp \
+ src_sql_models_qsqlquerymodel.cpp
diff --git a/src/sql/doc/snippets/snippets.pro b/src/sql/doc/snippets/snippets.pro
index 5653d478aa..68be4669cd 100644
--- a/src/sql/doc/snippets/snippets.pro
+++ b/src/sql/doc/snippets/snippets.pro
@@ -1,14 +1,10 @@
-TEMPLATE = app
-TARGET = sqldatabase_cppsnippet
-QT = core sql sql-private
+TEMPLATE = subdirs
+TARGET = sqldatabase_snippets
+SUBDIRS =
-SOURCES += sqldatabase/sqldatabase.cpp \
- code/doc_src_qtsql.cpp \
- code/doc_src_sql-driver.cpp \
- code/src_sql_kernel_qsqldatabase.cpp \
- code/src_sql_kernel_qsqlerror.cpp \
- code/src_sql_kernel_qsqlresult.cpp \
- code/src_sql_kernel_qsqldriver.cpp \
- code/src_sql_models_qsqlquerymodel.cpp
+contains(QT_BUILD_PARTS, tests) {
+ SUBDIRS += \
+ code \
+ sqldatabase
+}
-load(qt_common)
diff --git a/src/sql/doc/snippets/sqldatabase/sqldatabase.pro b/src/sql/doc/snippets/sqldatabase/sqldatabase.pro
new file mode 100644
index 0000000000..b31a52996e
--- /dev/null
+++ b/src/sql/doc/snippets/sqldatabase/sqldatabase.pro
@@ -0,0 +1,6 @@
+TEMPLATE = lib
+TARGET = sqldatabase_snippets
+QT = core sql
+
+SOURCES = \
+ sqldatabase.cpp