Skip to content

Commit f4e6a72

Browse files
author
Bernhard Stöcker
committed
Update Qt 6.6
1 parent 70ff15d commit f4e6a72

32 files changed

+168
-10652
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.5.3")
1+
set(QT_REPO_MODULE_VERSION "6.6.0")

‎CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ if(QT_FEATURE_sql_odbc)
4848
add_subdirectory(odbc)
4949
endif()
5050

51-
if(QT_FEATURE_sql_tds)
52-
# TODO add_subdirectory(tds)
53-
endif()
54-
5551
if(QT_FEATURE_sql_oci)
5652
add_subdirectory(oci)
5753
endif()
@@ -64,14 +60,14 @@ if(QT_FEATURE_sql_sqlite)
6460
add_subdirectory(sqlite)
6561
endif()
6662

67-
if(QT_FEATURE_sql_sqlite2)
68-
# TODO add_subdirectory(sqlite2)
69-
endif()
70-
7163
if(QT_FEATURE_sql_ibase)
7264
add_subdirectory(ibase)
7365
endif()
7466

67+
if(QT_FEATURE_sql_mimer)
68+
add_subdirectory(mimer)
69+
endif()
70+
7571
if(NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt")
7672
qt_print_feature_summary()
7773
endif()

‎CTestTestfile.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CMake generated Testfile for
2-
# Source directory: C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers
3-
# Build directory: C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers
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
44
#
55
# This file includes the relevant testing commands required for
66
# testing this directory and lists subdirectories to be tested as well.

‎cmake_install.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Install script for directory: C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers
1+
# Install script for directory: C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers
22

33
# Set the install prefix
44
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
5-
set(CMAKE_INSTALL_PREFIX "C:/Qt/Qt5.12/6.5.3/msvc2019_64")
5+
set(CMAKE_INSTALL_PREFIX "C:/Qt/Qt5.12/6.6.0/msvc2019_64")
66
endif()
77
string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
88

@@ -12,7 +12,7 @@ if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
1212
string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
1313
CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
1414
else()
15-
set(CMAKE_INSTALL_CONFIG_NAME "Release")
15+
set(CMAKE_INSTALL_CONFIG_NAME "RelWithDebInfo")
1616
endif()
1717
message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
1818
endif()
@@ -39,22 +39,22 @@ endif()
3939

4040
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
4141
# Include the install script for the subdirectory.
42-
include("C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers/psql/cmake_install.cmake")
42+
include("C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers/psql/cmake_install.cmake")
4343
endif()
4444

4545
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
4646
# Include the install script for the subdirectory.
47-
include("C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers/mysql/cmake_install.cmake")
47+
include("C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers/mysql/cmake_install.cmake")
4848
endif()
4949

5050
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
5151
# Include the install script for the subdirectory.
52-
include("C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers/odbc/cmake_install.cmake")
52+
include("C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers/odbc/cmake_install.cmake")
5353
endif()
5454

5555
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
5656
# Include the install script for the subdirectory.
57-
include("C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers/sqlite/cmake_install.cmake")
57+
include("C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers/sqlite/cmake_install.cmake")
5858
endif()
5959

6060
if(CMAKE_INSTALL_COMPONENT)
@@ -65,5 +65,5 @@ endif()
6565

6666
string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
6767
"${CMAKE_INSTALL_MANIFEST_FILES}")
68-
file(WRITE "C:/Qt/Qt5.12/6.5.3/Src/qtbase/src/plugins/sqldrivers/${CMAKE_INSTALL_MANIFEST}"
68+
file(WRITE "C:/Qt/Qt5.12/6.6.0/Src/qtbase/src/plugins/sqldrivers/${CMAKE_INSTALL_MANIFEST}"
6969
"${CMAKE_INSTALL_MANIFEST_CONTENT}")

‎config.summary‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ Qt Sql Drivers:
88
PostgreSQL ............................. yes
99
SQLite ................................. yes
1010
Using system provided SQLite ......... no
11+
Mimer .................................. no

‎configure.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ qt_find_package(Oracle PROVIDED_TARGETS Oracle::OCI MODULE_NAME sqldrivers QMAKE
2020
qt_find_package(ODBC PROVIDED_TARGETS ODBC::ODBC MODULE_NAME sqldrivers QMAKE_LIB odbc)
2121
qt_find_package(SQLite3 PROVIDED_TARGETS SQLite::SQLite3 MODULE_NAME sqldrivers QMAKE_LIB sqlite3)
2222
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)
2324
if(NOT WIN32 AND QT_FEATURE_system_zlib)
2425
qt_add_qmake_lib_dependency(sqlite3 zlib)
2526
endif()
@@ -64,6 +65,11 @@ qt_feature("system-sqlite" PRIVATE
6465
AUTODETECT OFF
6566
CONDITION QT_FEATURE_sql_sqlite AND SQLite3_FOUND
6667
)
68+
qt_feature("sql-mimer" PRIVATE
69+
LABEL "Mimer"
70+
CONDITION Mimer_FOUND
71+
)
72+
6773
qt_configure_add_summary_section(NAME "Qt Sql Drivers")
6874
qt_configure_add_summary_entry(ARGS "sql-db2")
6975
qt_configure_add_summary_entry(ARGS "sql-ibase")
@@ -73,6 +79,7 @@ qt_configure_add_summary_entry(ARGS "sql-odbc")
7379
qt_configure_add_summary_entry(ARGS "sql-psql")
7480
qt_configure_add_summary_entry(ARGS "sql-sqlite")
7581
qt_configure_add_summary_entry(ARGS "system-sqlite")
82+
qt_configure_add_summary_entry(ARGS "sql-mimer")
7683
qt_configure_end_summary_section() # end of "Qt Sql Drivers" section
7784
qt_configure_add_report_entry(
7885
TYPE WARNING

‎install_manifest.txt‎

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

‎mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets-debug.cmake‎

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

‎mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets-release.cmake‎

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

‎mysql/CMakeFiles/Export/6daf95e385d7cc8ad37a0af677fcce5d/Qt6QMYSQLDriverPluginTargets.cmake‎

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

0 commit comments

Comments
 (0)