From 806595c5b6c9fc3bfc3bc843ddd1a4b126d6a426 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 2 Nov 2018 14:27:57 +0100 Subject: Add Sql build and tests Change-Id: I9bf7d61a65950eafcfe6b3ea9c437e353ff7b2ed Reviewed-by: Frederik Gladhorn Reviewed-by: Simon Hausmann --- tests/auto/CMakeLists.txt | 32 +++++++++++----------- tests/auto/sql/CMakeLists.txt | 2 ++ tests/auto/sql/kernel/CMakeLists.txt | 9 ++++++ tests/auto/sql/kernel/qsql/CMakeLists.txt | 6 ++++ tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt | 6 ++++ tests/auto/sql/kernel/qsqldriver/CMakeLists.txt | 6 ++++ tests/auto/sql/kernel/qsqlerror/CMakeLists.txt | 1 + tests/auto/sql/kernel/qsqlfield/CMakeLists.txt | 1 + tests/auto/sql/kernel/qsqlquery/CMakeLists.txt | 6 ++++ tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt | 1 + tests/auto/sql/kernel/qsqlresult/CMakeLists.txt | 8 ++++++ tests/auto/sql/kernel/qsqlthread/CMakeLists.txt | 6 ++++ tests/auto/sql/models/CMakeLists.txt | 6 ++++ .../auto/sql/models/qsqlquerymodel/CMakeLists.txt | 7 +++++ .../models/qsqlrelationaldelegate/CMakeLists.txt | 7 +++++ .../models/qsqlrelationaltablemodel/CMakeLists.txt | 6 ++++ .../auto/sql/models/qsqltablemodel/CMakeLists.txt | 6 ++++ 17 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 tests/auto/sql/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsql/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqldriver/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqlerror/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqlfield/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqlquery/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqlresult/CMakeLists.txt create mode 100644 tests/auto/sql/kernel/qsqlthread/CMakeLists.txt create mode 100644 tests/auto/sql/models/CMakeLists.txt create mode 100644 tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt create mode 100644 tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt create mode 100644 tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt create mode 100644 tests/auto/sql/models/qsqltablemodel/CMakeLists.txt (limited to 'tests/auto') diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index d9d1b8349f..423c6fe884 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from auto.pro. if (NOT APPLE_UIKIT) - add_subdirectory("corelib") + add_subdirectory(corelib) endif() if (QT_FEATURE_dbus) set(run_dbus_tests ON) @@ -19,37 +19,37 @@ if (QT_FEATURE_dbus) endif() endif() if(run_dbus_tests) - add_subdirectory("dbus") + add_subdirectory(dbus) endif() endif() if (NOT APPLE_UIKIT AND TARGET Qt::Gui) - add_subdirectory("gui") + add_subdirectory(gui) endif() if (TARGET Qt::Network AND NOT WINRT) - # add_subdirectory("network") + # add_subdirectory(network) endif() if (TARGET Qt::OpenGL AND NOT WINRT) - add_subdirectory("opengl") + add_subdirectory(opengl) endif() -if (QT_FEATURE_sql) -# add_subdirectory("sql") +if (TARGET Qt::Sql) + add_subdirectory(sql) endif() -add_subdirectory("testlib") +add_subdirectory(testlib) if (NOT CMAKE_CROSSCOMPILE AND QT_FEATURE_process) -# add_subdirectory("tools") +# add_subdirectory(tools) endif() if (TARGET Qt::Xml) -# add_subdirectory("xml") +# add_subdirectory(xml) endif() if (TARGET Qt::Concurrent) - add_subdirectory("concurrent") + add_subdirectory(concurrent) endif() -# add_subdirectory("other") +# add_subdirectory(other) if (TARGET Qt::Widgets) - add_subdirectory("widgets") + add_subdirectory(widgets) endif() if (TARGET Qt::PrintSupport) -# add_subdirectory("printsupport") +# add_subdirectory(printsupport) endif() -# add_subdirectory("cmake") ## FIXME: Does this still make sense in this form? -# add_subdirectory("installed_cmake") ## FIXME: Does this still make sense in this form? +# add_subdirectory(cmake) ## FIXME: Does this still make sense in this form? +# add_subdirectory(installed_cmake) ## FIXME: Does this still make sense in this form? diff --git a/tests/auto/sql/CMakeLists.txt b/tests/auto/sql/CMakeLists.txt new file mode 100644 index 0000000000..7d4cd486b4 --- /dev/null +++ b/tests/auto/sql/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(kernel) +add_subdirectory(models) diff --git a/tests/auto/sql/kernel/CMakeLists.txt b/tests/auto/sql/kernel/CMakeLists.txt new file mode 100644 index 0000000000..8d3f0b6bc5 --- /dev/null +++ b/tests/auto/sql/kernel/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory(qsqlfield) +add_subdirectory(qsqldatabase) +add_subdirectory(qsqlerror) +add_subdirectory(qsqldriver) +add_subdirectory(qsqlquery) +add_subdirectory(qsqlrecord) +add_subdirectory(qsqlthread) +add_subdirectory(qsql) +add_subdirectory(qsqlresult) diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt new file mode 100644 index 0000000000..0e11fced12 --- /dev/null +++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsql + SOURCES tst_qsql.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt new file mode 100644 index 0000000000..344d96406b --- /dev/null +++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsqldatabase + SOURCES tst_qsqldatabase.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt new file mode 100644 index 0000000000..66139b08c9 --- /dev/null +++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsqldriver + SOURCES tst_qsqldriver.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt new file mode 100644 index 0000000000..4c2b7a8988 --- /dev/null +++ b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test(tst_qsqlerror SOURCES tst_qsqlerror.cpp LIBRARIES Qt::Sql) diff --git a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt new file mode 100644 index 0000000000..71b470706f --- /dev/null +++ b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test(tst_qsqlfield SOURCES tst_qsqlfield.cpp LIBRARIES Qt::Sql) diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt new file mode 100644 index 0000000000..5c35765679 --- /dev/null +++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsqlquery + SOURCES tst_qsqlquery.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt new file mode 100644 index 0000000000..68c80ed990 --- /dev/null +++ b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt @@ -0,0 +1 @@ +add_qt_test(tst_qsqlrecord SOURCES tst_qsqlrecord.cpp LIBRARIES Qt::Sql) diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt new file mode 100644 index 0000000000..01ac844bc5 --- /dev/null +++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt @@ -0,0 +1,8 @@ +add_qt_test(tst_qsqlresult + SOURCES + testsqldriver.h + tst_qsqlresult.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt new file mode 100644 index 0000000000..77762d286f --- /dev/null +++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsqlthread + SOURCES tst_qsqlthread.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/models/CMakeLists.txt b/tests/auto/sql/models/CMakeLists.txt new file mode 100644 index 0000000000..df530443c4 --- /dev/null +++ b/tests/auto/sql/models/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(qsqlrelationaltablemodel) +add_subdirectory(qsqltablemodel) + +if(TARGET Qt::Widgets) + add_subdirectory(qsqlquerymodel) +endif() diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt new file mode 100644 index 0000000000..0233cd8dc8 --- /dev/null +++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt @@ -0,0 +1,7 @@ +add_qt_test(tst_qsqlquerymodel + SOURCES tst_qsqlquerymodel.cpp + LIBRARIES + Qt::Widgets + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt new file mode 100644 index 0000000000..f84a74417c --- /dev/null +++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt @@ -0,0 +1,7 @@ +add_qt_test(tst_qsqlrelationaldelegate + SOURCES tst_qsqlrelationaldelegate.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate + Qt::Widgets +) diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt new file mode 100644 index 0000000000..efb2aa84a5 --- /dev/null +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsqlrelationaltablemodel + SOURCES tst_qsqlrelationaltablemodel.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt new file mode 100644 index 0000000000..b364e176f0 --- /dev/null +++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt @@ -0,0 +1,6 @@ +add_qt_test(tst_qsqltablemodel + SOURCES tst_qsqltablemodel.cpp + LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) -- cgit v1.2.3