diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-09-08 06:45:01 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-09-10 18:26:43 +0200 |
| commit | 00d9a0ea8e0796a4ebf19ea15550d66adcf1af86 (patch) | |
| tree | e1cf772c6c8a081feca5e6e519f4b9d5a05549ef /src/sql/doc | |
| parent | e7c15a60ea787ffe5e5b2dcd0c0f7c875553b11c (diff) | |
Doc: Compile snippets only when running tests
Turn snippets projects into subdirs with libraries to avoid
messy dependencies.
Fixes: QTBUG-86497
Pick-to: 5.15
Change-Id: Idb2c43f97d56c9b8d9992617ef716bde40fff5b7
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'src/sql/doc')
| -rw-r--r-- | src/sql/doc/snippets/code/code.pro | 11 | ||||
| -rw-r--r-- | src/sql/doc/snippets/snippets.pro | 23 | ||||
| -rw-r--r-- | src/sql/doc/snippets/sqldatabase/sqldatabase.pro | 6 |
3 files changed, 25 insertions, 15 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 36fad3f5ee..68be4669cd 100644 --- a/src/sql/doc/snippets/snippets.pro +++ b/src/sql/doc/snippets/snippets.pro @@ -1,17 +1,10 @@ -TEMPLATE = app -TARGET = sqldatabase_cppsnippet -QT = core sql-private +TEMPLATE = subdirs +TARGET = sqldatabase_snippets +SUBDIRS = -#! [qmake_use] -QT += sql -#! [qmake_use] +contains(QT_BUILD_PARTS, tests) { + SUBDIRS += \ + code \ + sqldatabase +} -SOURCES += sqldatabase/sqldatabase.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 - -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 |