Skip to content

Commit 661413e

Browse files
author
Bernhard Stöcker
committed
update Qt 6.7.3
1 parent d2b72f8 commit 661413e

8 files changed

+141
-116
lines changed

‎CTestTestfile.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# CMake generated Testfile for
2-
# Source directory: C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers
3-
# Build directory: C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers
2+
# Source directory: C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers
3+
# Build directory: C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers
44
#
55
# This file includes the relevant testing commands required for
66
# testing this directory and lists subdirectories to be tested as well.
7-
subdirs("psql")
87
subdirs("mysql")
98
subdirs("odbc")
109
subdirs("sqlite")

‎cmake_install.cmake

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎config.summary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Qt Sql Drivers:
55
MySql .................................. yes
66
OCI (Oracle) ........................... no
77
ODBC ................................... yes
8-
PostgreSQL ............................. yes
8+
PostgreSQL ............................. no
99
SQLite ................................. yes
1010
Using system provided SQLite ......... no
1111
Mimer .................................. no

‎install_manifest.txt

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfig.cmake
2-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersion.cmake
3-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersionImpl.cmake
4-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlpsql.dll
5-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets.cmake
6-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets-relwithdebinfo.cmake
7-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlpsql.debug
8-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginAdditionalTargetInfo.cmake
9-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake
10-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake
11-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake
12-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlmysql.dll
13-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake
14-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-relwithdebinfo.cmake
15-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlmysql.debug
16-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake
17-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake
18-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake
19-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake
20-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlodbc.dll
21-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake
22-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-relwithdebinfo.cmake
23-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlodbc.debug
24-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake
25-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake
26-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake
27-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake
28-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlite.dll
29-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake
30-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-relwithdebinfo.cmake
31-
C:/Qt/Qt5.12/6.6.2/mingw_64/./plugins/sqldrivers/qsqlite.debug
32-
C:/Qt/Qt5.12/6.6.2/mingw_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake
1+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake
2+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake
3+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake
4+
C:/Qt/6.7.3/msvc2019_64/plugins/sqldrivers/qsqlmysqld.dll
5+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake
6+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-debug.cmake
7+
C:/Qt/6.7.3/msvc2019_64/plugins/sqldrivers/qsqlmysqld.pdb
8+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake
9+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake
10+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake
11+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake
12+
C:/Qt/6.7.3/msvc2019_64/plugins/sqldrivers/qsqlodbcd.dll
13+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake
14+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-debug.cmake
15+
C:/Qt/6.7.3/msvc2019_64/plugins/sqldrivers/qsqlodbcd.pdb
16+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake
17+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake
18+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake
19+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake
20+
C:/Qt/6.7.3/msvc2019_64/plugins/sqldrivers/qsqlited.dll
21+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake
22+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-debug.cmake
23+
C:/Qt/6.7.3/msvc2019_64/plugins/sqldrivers/qsqlited.pdb
24+
C:/Qt/6.7.3/msvc2019_64/lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake

‎mysql/CTestTestfile.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# CMake generated Testfile for
2+
# Source directory: C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql
3+
# Build directory: C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql
4+
#
5+
# This file includes the relevant testing commands required for
6+
# testing this directory and lists subdirectories to be tested as well.

‎mysql/cmake_install.cmake

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# Install script for directory: C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql
2+
3+
# Set the install prefix
4+
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
5+
set(CMAKE_INSTALL_PREFIX "C:/Qt/6.7.3/msvc2019_64")
6+
endif()
7+
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
8+
9+
# Set the install configuration name.
10+
if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
11+
if(BUILD_TYPE)
12+
string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
13+
CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
14+
else()
15+
set(CMAKE_INSTALL_CONFIG_NAME "RelWithDebInfo")
16+
endif()
17+
message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
18+
endif()
19+
20+
# Set the component getting installed.
21+
if(NOT CMAKE_INSTALL_COMPONENT)
22+
if(COMPONENT)
23+
message(STATUS "Install component: \"${COMPONENT}\"")
24+
set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
25+
else()
26+
set(CMAKE_INSTALL_COMPONENT)
27+
endif()
28+
endif()
29+
30+
# Is this installation the result of a crosscompile?
31+
if(NOT DEFINED CMAKE_CROSSCOMPILING)
32+
set(CMAKE_CROSSCOMPILING "FALSE")
33+
endif()
34+
35+
# Set default install directory permissions.
36+
if(NOT DEFINED CMAKE_OBJDUMP)
37+
set(CMAKE_OBJDUMP "CMAKE_OBJDUMP-NOTFOUND")
38+
endif()
39+
40+
if(CMAKE_INSTALL_COMPONENT STREQUAL "Devel" OR NOT CMAKE_INSTALL_COMPONENT)
41+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql" TYPE FILE FILES
42+
"C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake"
43+
"C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake"
44+
"C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake"
45+
)
46+
endif()
47+
48+
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
49+
if(CMAKE_INSTALL_CONFIG_NAME MATCHES "^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$")
50+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers" TYPE MODULE FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/plugins/sqldrivers/qsqlmysql.dll")
51+
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers/qsqlmysql.dll" AND
52+
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers/qsqlmysql.dll")
53+
if(CMAKE_INSTALL_DO_STRIP)
54+
execute_process(COMMAND "CMAKE_STRIP-NOTFOUND" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers/qsqlmysql.dll")
55+
endif()
56+
endif()
57+
elseif(CMAKE_INSTALL_CONFIG_NAME MATCHES "^([Dd][Ee][Bb][Uu][Gg])$")
58+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers" TYPE MODULE FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/plugins/sqldrivers/qsqlmysqld.dll")
59+
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers/qsqlmysqld.dll" AND
60+
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers/qsqlmysqld.dll")
61+
if(CMAKE_INSTALL_DO_STRIP)
62+
execute_process(COMMAND "CMAKE_STRIP-NOTFOUND" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers/qsqlmysqld.dll")
63+
endif()
64+
endif()
65+
endif()
66+
endif()
67+
68+
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
69+
if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake")
70+
file(DIFFERENT _cmake_export_file_changed FILES
71+
"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake"
72+
"C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets.cmake")
73+
if(_cmake_export_file_changed)
74+
file(GLOB _cmake_old_config_files "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-*.cmake")
75+
if(_cmake_old_config_files)
76+
string(REPLACE ";" ", " _cmake_old_config_files_text "${_cmake_old_config_files}")
77+
message(STATUS "Old export file \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake\" will be replaced. Removing files [${_cmake_old_config_files_text}].")
78+
unset(_cmake_old_config_files_text)
79+
file(REMOVE ${_cmake_old_config_files})
80+
endif()
81+
unset(_cmake_old_config_files)
82+
endif()
83+
unset(_cmake_export_file_changed)
84+
endif()
85+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql" TYPE FILE FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets.cmake")
86+
if(CMAKE_INSTALL_CONFIG_NAME MATCHES "^([Dd][Ee][Bb][Uu][Gg])$")
87+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql" TYPE FILE FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets-debug.cmake")
88+
endif()
89+
if(CMAKE_INSTALL_CONFIG_NAME MATCHES "^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$")
90+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql" TYPE FILE FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets-relwithdebinfo.cmake")
91+
endif()
92+
endif()
93+
94+
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
95+
if(CMAKE_INSTALL_CONFIG_NAME MATCHES "^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$")
96+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers" TYPE FILE OPTIONAL FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/plugins/sqldrivers/qsqlmysql.pdb")
97+
elseif(CMAKE_INSTALL_CONFIG_NAME MATCHES "^([Dd][Ee][Bb][Uu][Gg])$")
98+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/plugins/sqldrivers" TYPE FILE OPTIONAL FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/plugins/sqldrivers/qsqlmysqld.pdb")
99+
endif()
100+
endif()
101+
102+
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
103+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/cmake/Qt6Sql" TYPE FILE FILES "C:/Qt/6.7.3/Src/qtbase/src/plugins/sqldrivers/lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake")
104+
endif()
105+

‎qt_cmdline.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,3 @@ qt_commandline_option(sql-odbc TYPE boolean)
1212
qt_commandline_option(sql-psql TYPE boolean)
1313
qt_commandline_option(sql-sqlite TYPE boolean)
1414
qt_commandline_option(sql-mimer TYPE boolean)
15-
qt_commandline_option(plugin-sql-db2 TYPE void NAME sql-db2)
16-
qt_commandline_option(plugin-sql-ibase TYPE void NAME sql-ibase)
17-
qt_commandline_option(plugin-sql-mysql TYPE void NAME sql-mysql)
18-
qt_commandline_option(plugin-sql-oci TYPE void NAME sql-oci)
19-
qt_commandline_option(plugin-sql-odbc TYPE void NAME sql-odbc)
20-
qt_commandline_option(plugin-sql-psql TYPE void NAME sql-psql)
21-
qt_commandline_option(plugin-sql-sqlite TYPE void NAME sql-sqlite)
22-
qt_commandline_option(plugin-sql-mimer TYPE void NAME sql-mimer)

‎qtsqldrivers-config_p.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#define QT_FEATURE_sql_db2 -1
22

3-
#define QT_FEATURE_sql_ibase 1
3+
#define QT_FEATURE_sql_ibase -1
44

5-
#define QT_FEATURE_sql_mysql -1
5+
#define QT_FEATURE_sql_mysql 1
66

77
#define QT_FEATURE_sql_oci -1
88

99
#define QT_FEATURE_sql_odbc 1
1010

11-
#define QT_FEATURE_sql_psql 1
11+
#define QT_FEATURE_sql_psql -1
1212

1313
#define QT_FEATURE_sql_sqlite 1
1414

0 commit comments

Comments
 (0)