13 files changed, 387 insertions, 9 deletions
diff --git a/examples/sql/CMakeLists.txt b/examples/sql/CMakeLists.txt
new file mode 100644
index 0000000000..ca15f22baf
--- /dev/null
+++ b/examples/sql/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from sql.pro.
+
+add_subdirectory(books)
+add_subdirectory(drilldown)
+add_subdirectory(cachedtable)
+add_subdirectory(querymodel)
+add_subdirectory(relationaltablemodel)
+add_subdirectory(sqlwidgetmapper)
+add_subdirectory(tablemodel)
+
+if(TARGET Qt::Xml)
+    add_subdirectory(masterdetail)
+endif()
+
+if(NOT CMAKE_CROSSCOMPILING) # special case
+    add_subdirectory(sqlbrowser)
+endif()
diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt
new file mode 100644
index 0000000000..870d90bf14
--- /dev/null
+++ b/examples/sql/books/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from books.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(books LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/books")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(books
+    bookdelegate.cpp bookdelegate.h
+    bookwindow.cpp bookwindow.h bookwindow.ui
+    initdb.h
+    main.cpp
+)
+target_include_directories(books PUBLIC
+    .
+)
+
+target_link_libraries(books PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+
+# Resources:
+set(books_resource_files
+    "images/star.png"
+)
+
+qt6_add_resources(books "books"
+    PREFIX
+        "/"
+    FILES
+        ${books_resource_files}
+)
+
+install(TARGETS books
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt
new file mode 100644
index 0000000000..872c462fdd
--- /dev/null
+++ b/examples/sql/cachedtable/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from cachedtable.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(cachedtable LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/cachedtable")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(cachedtable
+    ../connection.h
+    main.cpp
+    tableeditor.cpp tableeditor.h
+)
+target_link_libraries(cachedtable PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS cachedtable
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt
new file mode 100644
index 0000000000..5b6bea0423
--- /dev/null
+++ b/examples/sql/drilldown/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from drilldown.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(drilldown LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/drilldown")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(drilldown
+    ../connection.h
+    imageitem.cpp imageitem.h
+    informationwindow.cpp informationwindow.h
+    main.cpp
+    view.cpp view.h
+)
+target_link_libraries(drilldown PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+
+# Resources:
+set(drilldown_resource_files
+    "images/qt-creator.png"
+    "images/qt-logo.png"
+    "images/qt-project.png"
+    "images/qt-quick.png"
+)
+
+qt6_add_resources(drilldown "drilldown"
+    PREFIX
+        "/"
+    FILES
+        ${drilldown_resource_files}
+)
+
+install(TARGETS drilldown
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp
index 0007432672..349416b553 100644
--- a/examples/sql/drilldown/informationwindow.cpp
+++ b/examples/sql/drilldown/informationwindow.cpp
@@ -87,7 +87,7 @@ InformationWindow::InformationWindow(int id, QSqlRelationalTableModel *items,
     connect(descriptionEditor, &QTextEdit::textChanged, [=]() {
         enableButtons();
     });
-    connect(imageFileEditor, QOverload<int>::of(&QComboBox::currentIndexChanged), [=]() {
+    connect(imageFileEditor, &QComboBox::currentIndexChanged, [=]() {
         enableButtons();
     });
 
diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt
new file mode 100644
index 0000000000..7052461601
--- /dev/null
+++ b/examples/sql/masterdetail/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generated from masterdetail.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(masterdetail LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/masterdetail")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+find_package(Qt6 COMPONENTS Xml)
+
+add_qt_gui_executable(masterdetail
+    database.h
+    dialog.cpp dialog.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+)
+target_link_libraries(masterdetail PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+    Qt::Xml
+)
+
+
+# Resources:
+set(masterdetail_resource_files
+    "images/icon.png"
+    "images/image.png"
+)
+
+qt6_add_resources(masterdetail "masterdetail"
+    PREFIX
+        "/"
+    FILES
+        ${masterdetail_resource_files}
+)
+
+install(TARGETS masterdetail
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp
index 2ff9a10d91..11f123372c 100644
--- a/examples/sql/masterdetail/mainwindow.cpp
+++ b/examples/sql/masterdetail/mainwindow.cpp
@@ -283,7 +283,7 @@ QGroupBox* MainWindow::createArtistGroupBox()
     artistView->setModel(model->relationModel(2));
     artistView->setModelColumn(1);
 
-    connect(artistView, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(artistView, &QComboBox::currentIndexChanged,
             this, &MainWindow::changeArtist);
 
     QGroupBox *box = new QGroupBox(tr("Artist"));
diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt
new file mode 100644
index 0000000000..e4127baeef
--- /dev/null
+++ b/examples/sql/querymodel/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from querymodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(querymodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/querymodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(querymodel
+    ../connection.h
+    customsqlmodel.cpp customsqlmodel.h
+    editablesqlmodel.cpp editablesqlmodel.h
+    main.cpp
+)
+target_link_libraries(querymodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS querymodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt
new file mode 100644
index 0000000000..c758f3c32d
--- /dev/null
+++ b/examples/sql/relationaltablemodel/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from relationaltablemodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(relationaltablemodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/relationaltablemodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(relationaltablemodel
+    ../connection.h
+    relationaltablemodel.cpp
+)
+target_link_libraries(relationaltablemodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS relationaltablemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt
new file mode 100644
index 0000000000..833b57f1a1
--- /dev/null
+++ b/examples/sql/sqlbrowser/CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from sqlbrowser.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sqlbrowser LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/sqlbrowser")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sqlbrowser
+    browser.cpp browser.h
+    browserwidget.ui
+    connectionwidget.cpp connectionwidget.h
+    main.cpp
+    qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui
+)
+target_link_libraries(sqlbrowser PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS sqlbrowser
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
index 0d4a1bde77..482048ab98 100644
--- a/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
+++ b/examples/sql/sqlbrowser/qsqlconnectiondialog.cpp
@@ -60,13 +60,6 @@ QSqlConnectionDialog::QSqlConnectionDialog(QWidget *parent)
 
     QStringList drivers = QSqlDatabase::drivers();
 
-    // remove compat names
-    drivers.removeAll("QMYSQL3");
-    drivers.removeAll("QOCI8");
-    drivers.removeAll("QODBC3");
-    drivers.removeAll("QPSQL7");
-    drivers.removeAll("QTDS7");
-
     if (!drivers.contains("QSQLITE"))
         ui.dbCheckBox->setEnabled(false);
 
diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt
new file mode 100644
index 0000000000..8d8a1a82ed
--- /dev/null
+++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from sqlwidgetmapper.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(sqlwidgetmapper LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/sqlwidgetmapper")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(sqlwidgetmapper
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(sqlwidgetmapper PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS sqlwidgetmapper
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt
new file mode 100644
index 0000000000..85e1bd9167
--- /dev/null
+++ b/examples/sql/tablemodel/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from tablemodel.pro.
+
+cmake_minimum_required(VERSION 3.14)
+project(tablemodel LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples/sql/tablemodel")
+
+find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Sql)
+find_package(Qt6 COMPONENTS Widgets)
+
+add_qt_gui_executable(tablemodel
+    ../connection.h
+    tablemodel.cpp
+)
+target_link_libraries(tablemodel PUBLIC
+    Qt::Core
+    Qt::Gui
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS tablemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)