From 00d9a0ea8e0796a4ebf19ea15550d66adcf1af86 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 8 Sep 2020 06:45:01 +0200 Subject: 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 --- src/sql/doc/snippets/code/code.pro | 11 +++++++++++ src/sql/doc/snippets/snippets.pro | 23 ++++++++--------------- src/sql/doc/snippets/sqldatabase/sqldatabase.pro | 6 ++++++ 3 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 src/sql/doc/snippets/code/code.pro create mode 100644 src/sql/doc/snippets/sqldatabase/sqldatabase.pro (limited to 'src/sql') 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 -- cgit v1.2.3