summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-05-17 16:24:35 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-05-20 09:38:07 +0000
commitfbbfbcf360f5935a0f609bf2a9f152b293ee9333 (patch)
treef8f09c913bde6bacdbf2a2062053d8349096911a
parent8cf45a6848525bd3d6e22468abf1362f51132d23 (diff)
Regenerate sql
Change-Id: I495678a5c77557ae297b7dd028f1253ebcce9ef7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r--src/sql/CMakeLists.txt21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index d438b78446..f84d12dc12 100644
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -19,23 +19,25 @@ add_qt_module(Sql
kernel/qsqlresult.cpp kernel/qsqlresult.h kernel/qsqlresult_p.h
kernel/qtsqlglobal.h kernel/qtsqlglobal_p.h
DEFINES
- QT_NO_USING_NAMESPACE
QT_NO_CAST_FROM_ASCII
QT_NO_FOREACH
+ QT_NO_USING_NAMESPACE
LIBRARIES
Qt::CorePrivate
- PUBLIC_LIBRARIES # special case
+ PUBLIC_LIBRARIES
Qt::Core
- # MODULE_PLUGIN_TYPES = "sqldrivers"
- # PRECOMPILED_HEADER = "../corelib/global/qt_pch.h"
- # SQL_P = "sql"
- # _LOADED = "qt_module"
)
+#### Keys ignored in scope 1:.:.:sql.pro:<TRUE>:
+# MODULE_PLUGIN_TYPES = "sqldrivers"
+# PRECOMPILED_HEADER = "../corelib/global/qt_pch.h"
+# SQL_P = "sql"
+# _LOADED = "qt_module"
+
## Scopes:
#####################################################################
-extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
+extend_target(Sql CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
LINK_OPTIONS
"/BASE:0x62000000"
)
@@ -47,5 +49,6 @@ extend_target(Sql CONDITION QT_FEATURE_sqlmodel
models/qsqlrelationaltablemodel.cpp models/qsqlrelationaltablemodel.h
models/qsqltablemodel.cpp models/qsqltablemodel.h models/qsqltablemodel_p.h
)
-
-add_qt_docs(./doc/qtsql.qdocconf)
+add_qt_docs(
+ doc/qtsql.qdocconf
+)