Skip to content

Commit 1721021

Browse files
thecodemonkey86thecodemonkey86
committed
update v6.9.3
1 parent 3519750 commit 1721021

File tree

11 files changed

+357
-357
lines changed

11 files changed

+357
-357
lines changed

‎.cmake.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(QT_REPO_MODULE_VERSION "6.9.1")
1+
set(QT_REPO_MODULE_VERSION "6.9.3")

‎.qmake.conf‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# This file detaches this sub-tree from the rest of qtbase,
2-
# so it can be configured stand-alone.
3-
# Of course, under normal circumstances, this _is_ part of qtbase,
4-
# so we have to make some contortions to restore normality.
5-
6-
isEmpty(_QMAKE_CONF_): return() # Pre-scan during spec loading.
7-
8-
SQLDRV_SRC_TREE = $$dirname(_QMAKE_CONF_)
9-
QTBASE_SRC_TREE = $$section(SQLDRV_SRC_TREE, /, 0, -4)
10-
11-
QTBASE_BLD_TREE = $$shadowed($$QTBASE_SRC_TREE)
12-
!isEmpty(QTBASE_BLD_TREE):exists($$QTBASE_BLD_TREE/.qmake.cache) {
13-
# This tricks qt_build_config.prf and qt_build_paths.prf
14-
_QMAKE_CONF_ = $$QTBASE_SRC_TREE/.qmake.conf
15-
} else {
16-
CONFIG += sqldrivers_standalone
17-
}
18-
19-
include($$QTBASE_SRC_TREE/.qmake.conf)
1+
# This file detaches this sub-tree from the rest of qtbase,
2+
# so it can be configured stand-alone.
3+
# Of course, under normal circumstances, this _is_ part of qtbase,
4+
# so we have to make some contortions to restore normality.
5+
6+
isEmpty(_QMAKE_CONF_): return() # Pre-scan during spec loading.
7+
8+
SQLDRV_SRC_TREE = $$dirname(_QMAKE_CONF_)
9+
QTBASE_SRC_TREE = $$section(SQLDRV_SRC_TREE, /, 0, -4)
10+
11+
QTBASE_BLD_TREE = $$shadowed($$QTBASE_SRC_TREE)
12+
!isEmpty(QTBASE_BLD_TREE):exists($$QTBASE_BLD_TREE/.qmake.cache) {
13+
# This tricks qt_build_config.prf and qt_build_paths.prf
14+
_QMAKE_CONF_ = $$QTBASE_SRC_TREE/.qmake.conf
15+
} else {
16+
CONFIG += sqldrivers_standalone
17+
}
18+
19+
include($$QTBASE_SRC_TREE/.qmake.conf)

‎CMakeLists.txt‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
1-
# Copyright (C) 2022 The Qt Company Ltd.
2-
# SPDX-License-Identifier: BSD-3-Clause
3-
4-
cmake_minimum_required(VERSION 3.16)
5-
if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
6-
include(.cmake.conf)
7-
# Store initial build type (if any is specified) to be read by
8-
# qt_internal_set_cmake_build_type().
9-
# See qt_internal_set_cmake_build_type() for details.
10-
if(DEFINED CACHE{CMAKE_BUILD_TYPE})
11-
set(__qt_internal_standalone_project_cmake_build_type_before_project_call
12-
"${CMAKE_BUILD_TYPE}")
13-
endif()
14-
15-
project(QSQLiteDriverPlugins
16-
VERSION "${QT_REPO_MODULE_VERSION}"
17-
DESCRIPTION "Qt6 SQL driver plugins"
18-
HOMEPAGE_URL "https://qt.io/"
19-
LANGUAGES CXX C
20-
)
21-
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
22-
BuildInternals
23-
Core
24-
Sql
25-
)
26-
# Use qtbase license files for standalone builds.
27-
set(QT_SBOM_LICENSE_DIRS "${PROJECT_SOURCE_DIR}/../../../LICENSES")
28-
qt_build_repo_begin()
29-
else()
30-
qt_internal_upgrade_cmake_policies()
31-
endif()
32-
33-
# Currently handled completely manually.
34-
35-
# TODO sqldrivers_standalone {
36-
# _QMAKE_CACHE_ = $$shadowed($$SQLDRV_SRC_TREE)/.qmake.conf
37-
# load(qt_configure)
38-
# }
39-
40-
qt_feature_module_begin(
41-
NO_MODULE
42-
PUBLIC_FILE "qtsqldrivers-config.h"
43-
PRIVATE_FILE "qtsqldrivers-config_p.h"
44-
)
45-
include(configure.cmake)
46-
qt_feature_module_end(NO_MODULE)
47-
48-
49-
if(QT_FEATURE_sql_psql AND QT_FEATURE_regularexpression)
50-
add_subdirectory(psql)
51-
endif()
52-
53-
if(QT_FEATURE_sql_mysql)
54-
add_subdirectory(mysql)
55-
endif()
56-
57-
if(QT_FEATURE_sql_odbc)
58-
add_subdirectory(odbc)
59-
endif()
60-
61-
if(QT_FEATURE_sql_oci)
62-
add_subdirectory(oci)
63-
endif()
64-
65-
if(QT_FEATURE_sql_db2)
66-
add_subdirectory(db2)
67-
endif()
68-
69-
if(QT_FEATURE_sql_sqlite)
70-
add_subdirectory(sqlite)
71-
endif()
72-
73-
if(QT_FEATURE_sql_ibase)
74-
add_subdirectory(ibase)
75-
endif()
76-
77-
if(QT_FEATURE_sql_mimer)
78-
add_subdirectory(mimer)
79-
endif()
80-
81-
if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
82-
qt_build_repo_end()
83-
endif()
1+
# Copyright (C) 2022 The Qt Company Ltd.
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
4+
cmake_minimum_required(VERSION 3.16)
5+
if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
6+
include(.cmake.conf)
7+
# Store initial build type (if any is specified) to be read by
8+
# qt_internal_set_cmake_build_type().
9+
# See qt_internal_set_cmake_build_type() for details.
10+
if(DEFINED CACHE{CMAKE_BUILD_TYPE})
11+
set(__qt_internal_standalone_project_cmake_build_type_before_project_call
12+
"${CMAKE_BUILD_TYPE}")
13+
endif()
14+
15+
project(QSQLiteDriverPlugins
16+
VERSION "${QT_REPO_MODULE_VERSION}"
17+
DESCRIPTION "Qt6 SQL driver plugins"
18+
HOMEPAGE_URL "https://qt.io/"
19+
LANGUAGES CXX C
20+
)
21+
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
22+
BuildInternals
23+
Core
24+
Sql
25+
)
26+
# Use qtbase license files for standalone builds.
27+
set(QT_SBOM_LICENSE_DIRS "${PROJECT_SOURCE_DIR}/../../../LICENSES")
28+
qt_build_repo_begin()
29+
else()
30+
qt_internal_upgrade_cmake_policies()
31+
endif()
32+
33+
# Currently handled completely manually.
34+
35+
# TODO sqldrivers_standalone {
36+
# _QMAKE_CACHE_ = $$shadowed($$SQLDRV_SRC_TREE)/.qmake.conf
37+
# load(qt_configure)
38+
# }
39+
40+
qt_feature_module_begin(
41+
NO_MODULE
42+
PUBLIC_FILE "qtsqldrivers-config.h"
43+
PRIVATE_FILE "qtsqldrivers-config_p.h"
44+
)
45+
include(configure.cmake)
46+
qt_feature_module_end(NO_MODULE)
47+
48+
49+
if(QT_FEATURE_sql_psql AND QT_FEATURE_regularexpression)
50+
add_subdirectory(psql)
51+
endif()
52+
53+
if(QT_FEATURE_sql_mysql)
54+
add_subdirectory(mysql)
55+
endif()
56+
57+
if(QT_FEATURE_sql_odbc)
58+
add_subdirectory(odbc)
59+
endif()
60+
61+
if(QT_FEATURE_sql_oci)
62+
add_subdirectory(oci)
63+
endif()
64+
65+
if(QT_FEATURE_sql_db2)
66+
add_subdirectory(db2)
67+
endif()
68+
69+
if(QT_FEATURE_sql_sqlite)
70+
add_subdirectory(sqlite)
71+
endif()
72+
73+
if(QT_FEATURE_sql_ibase)
74+
add_subdirectory(ibase)
75+
endif()
76+
77+
if(QT_FEATURE_sql_mimer)
78+
add_subdirectory(mimer)
79+
endif()
80+
81+
if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
82+
qt_build_repo_end()
83+
endif()

‎README‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Please note that the DB2, MySQL and Oracle client drivers are not
2-
distributed with the Qt Open Source Editions.
3-
4-
This is because the client libraries are distributed under a license which
5-
is not compatible with the GPL license.
1+
Please note that the DB2, MySQL and Oracle client drivers are not
2+
distributed with the Qt Open Source Editions.
3+
4+
This is because the client libraries are distributed under a license which
5+
is not compatible with the GPL license.

‎configure.cmake‎

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
# Copyright (C) 2022 The Qt Company Ltd.
2-
# SPDX-License-Identifier: BSD-3-Clause
3-
4-
5-
6-
#### Inputs
7-
8-
# input sqlite
9-
set(INPUT_sqlite "undefined" CACHE STRING "")
10-
set_property(CACHE INPUT_sqlite PROPERTY STRINGS undefined qt system)
11-
12-
13-
14-
#### Libraries
15-
16-
qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2 MODULE_NAME sqldrivers QMAKE_LIB db2)
17-
qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL MODULE_NAME sqldrivers QMAKE_LIB mysql)
18-
qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL MODULE_NAME sqldrivers QMAKE_LIB psql)
19-
qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE_LIB oci)
20-
qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc)
21-
qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3)
22-
qt_find_package(Interbase PROVIDED_TARGETS Interbase::Interbase MODULE_NAME sqldrivers QMAKE_LIB ibase) # special case
23-
qt_find_package(Mimer PROVIDED_TARGETS MimerSQL::MimerSQL MODULE_NAME sqldrivers QMAKE_LIB mimer)
24-
if(NOT WIN32 AND QT_FEATURE_system_zlib)
25-
qt_add_qmake_lib_dependency(sqlite3 zlib)
26-
endif()
27-
28-
29-
#### Tests
30-
31-
32-
33-
#### Features
34-
35-
qt_feature("sql-db2" PRIVATE
36-
LABEL "DB2 (IBM)"
37-
CONDITION DB2_FOUND
38-
)
39-
qt_feature("sql-ibase" PRIVATE
40-
LABEL "InterBase"
41-
CONDITION Interbase_FOUND # special case
42-
)
43-
qt_feature("sql-mysql" PRIVATE
44-
LABEL "MySql"
45-
CONDITION MySQL_FOUND
46-
)
47-
qt_feature("sql-oci" PRIVATE
48-
LABEL "OCI (Oracle)"
49-
CONDITION Oracle_FOUND
50-
)
51-
qt_feature("sql-odbc" PRIVATE
52-
LABEL "ODBC"
53-
CONDITION QT_FEATURE_datestring AND ODBC_FOUND
54-
)
55-
qt_feature("sql-psql" PRIVATE
56-
LABEL "PostgreSQL"
57-
CONDITION PostgreSQL_FOUND
58-
)
59-
qt_feature("sql-sqlite" PRIVATE
60-
LABEL "SQLite"
61-
CONDITION QT_FEATURE_datestring
62-
)
63-
qt_feature("system-sqlite" PRIVATE SYSTEM_LIBRARY
64-
LABEL " Using system provided SQLite"
65-
AUTODETECT OFF
66-
CONDITION QT_FEATURE_sql_sqlite AND SQLite3_FOUND
67-
)
68-
qt_feature("sql-mimer" PRIVATE
69-
LABEL "Mimer"
70-
CONDITION Mimer_FOUND
71-
)
72-
73-
qt_configure_add_summary_section(NAME "Qt Sql Drivers")
74-
qt_configure_add_summary_entry(ARGS "sql-db2")
75-
qt_configure_add_summary_entry(ARGS "sql-ibase")
76-
qt_configure_add_summary_entry(ARGS "sql-mysql")
77-
qt_configure_add_summary_entry(ARGS "sql-oci")
78-
qt_configure_add_summary_entry(ARGS "sql-odbc")
79-
qt_configure_add_summary_entry(ARGS "sql-psql")
80-
qt_configure_add_summary_entry(ARGS "sql-sqlite")
81-
qt_configure_add_summary_entry(ARGS "system-sqlite")
82-
qt_configure_add_summary_entry(ARGS "sql-mimer")
83-
qt_configure_end_summary_section() # end of "Qt Sql Drivers" section
84-
qt_configure_add_report_entry(
85-
TYPE WARNING
86-
MESSAGE "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail."
87-
CONDITION WIN32 AND NOT MSVC AND QT_FEATURE_sql_oci
88-
)
1+
# Copyright (C) 2022 The Qt Company Ltd.
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
4+
5+
6+
#### Inputs
7+
8+
# input sqlite
9+
set(INPUT_sqlite "undefined" CACHE STRING "")
10+
set_property(CACHE INPUT_sqlite PROPERTY STRINGS undefined qt system)
11+
12+
13+
14+
#### Libraries
15+
16+
qt_find_package(DB2 PROVIDED_TARGETS DB2::DB2 MODULE_NAME sqldrivers QMAKE_LIB db2)
17+
qt_find_package(MySQL PROVIDED_TARGETS MySQL::MySQL MODULE_NAME sqldrivers QMAKE_LIB mysql)
18+
qt_find_package(PostgreSQL PROVIDED_TARGETS PostgreSQL::PostgreSQL MODULE_NAME sqldrivers QMAKE_LIB psql)
19+
qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE_LIB oci)
20+
qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc)
21+
qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3)
22+
qt_find_package(Interbase PROVIDED_TARGETS Interbase::Interbase MODULE_NAME sqldrivers QMAKE_LIB ibase) # special case
23+
qt_find_package(Mimer PROVIDED_TARGETS MimerSQL::MimerSQL MODULE_NAME sqldrivers QMAKE_LIB mimer)
24+
if(NOT WIN32 AND QT_FEATURE_system_zlib)
25+
qt_add_qmake_lib_dependency(sqlite3 zlib)
26+
endif()
27+
28+
29+
#### Tests
30+
31+
32+
33+
#### Features
34+
35+
qt_feature("sql-db2" PRIVATE
36+
LABEL "DB2 (IBM)"
37+
CONDITION DB2_FOUND
38+
)
39+
qt_feature("sql-ibase" PRIVATE
40+
LABEL "InterBase"
41+
CONDITION Interbase_FOUND # special case
42+
)
43+
qt_feature("sql-mysql" PRIVATE
44+
LABEL "MySql"
45+
CONDITION MySQL_FOUND
46+
)
47+
qt_feature("sql-oci" PRIVATE
48+
LABEL "OCI (Oracle)"
49+
CONDITION Oracle_FOUND
50+
)
51+
qt_feature("sql-odbc" PRIVATE
52+
LABEL "ODBC"
53+
CONDITION QT_FEATURE_datestring AND ODBC_FOUND
54+
)
55+
qt_feature("sql-psql" PRIVATE
56+
LABEL "PostgreSQL"
57+
CONDITION PostgreSQL_FOUND
58+
)
59+
qt_feature("sql-sqlite" PRIVATE
60+
LABEL "SQLite"
61+
CONDITION QT_FEATURE_datestring
62+
)
63+
qt_feature("system-sqlite" PRIVATE SYSTEM_LIBRARY
64+
LABEL " Using system provided SQLite"
65+
AUTODETECT OFF
66+
CONDITION QT_FEATURE_sql_sqlite AND SQLite3_FOUND
67+
)
68+
qt_feature("sql-mimer" PRIVATE
69+
LABEL "Mimer"
70+
CONDITION Mimer_FOUND
71+
)
72+
73+
qt_configure_add_summary_section(NAME "Qt Sql Drivers")
74+
qt_configure_add_summary_entry(ARGS "sql-db2")
75+
qt_configure_add_summary_entry(ARGS "sql-ibase")
76+
qt_configure_add_summary_entry(ARGS "sql-mysql")
77+
qt_configure_add_summary_entry(ARGS "sql-oci")
78+
qt_configure_add_summary_entry(ARGS "sql-odbc")
79+
qt_configure_add_summary_entry(ARGS "sql-psql")
80+
qt_configure_add_summary_entry(ARGS "sql-sqlite")
81+
qt_configure_add_summary_entry(ARGS "system-sqlite")
82+
qt_configure_add_summary_entry(ARGS "sql-mimer")
83+
qt_configure_end_summary_section() # end of "Qt Sql Drivers" section
84+
qt_configure_add_report_entry(
85+
TYPE WARNING
86+
MESSAGE "Qt does not support compiling the Oracle database driver with MinGW, due to lack of such support from Oracle. Consider disabling the Oracle driver, as the current build will most likely fail."
87+
CONDITION WIN32 AND NOT MSVC AND QT_FEATURE_sql_oci
88+
)

0 commit comments

Comments
 (0)