Merge branch 'Qt_6.7' of https://github.com/thecodemonkey86/qt_mysql_…

…driver into Qt_6.7
thecodemonkey86 · Jun 19, 2024 · a3ddcf9 · a3ddcf9
2 parents 224fdb9 + d2b72f8
commit a3ddcf9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,14 @@
 cmake_minimum_required(VERSION 3.16)
 if (NOT CMAKE_PROJECT_NAME STREQUAL "QtBase" AND NOT CMAKE_PROJECT_NAME STREQUAL "Qt")
     include(.cmake.conf)
+    # Store initial build type (if any is specified) to be read by
+    # qt_internal_set_cmake_build_type().
+    # See qt_internal_set_cmake_build_type() for details.
+    if(DEFINED CACHE{CMAKE_BUILD_TYPE})
+        set(__qt_internal_standalone_project_cmake_build_type_before_project_call
+            "${CMAKE_BUILD_TYPE}")
+    endif()
+
     project(QSQLiteDriverPlugins
         VERSION "${QT_REPO_MODULE_VERSION}"
         DESCRIPTION "Qt6 SQL driver plugins"

diff --git a/qtsqldrivers-config_p.h b/qtsqldrivers-config_p.h
@@ -1,8 +1,8 @@
 #define QT_FEATURE_sql_db2 -1
 
-#define QT_FEATURE_sql_ibase -1
+#define QT_FEATURE_sql_ibase 1
 
-#define QT_FEATURE_sql_mysql 1
+#define QT_FEATURE_sql_mysql -1
 
 #define QT_FEATURE_sql_oci -1