9 files changed, 239 insertions, 165 deletions
diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt
index 7a25b95cde..294a764a9b 100644
--- a/examples/sql/books/CMakeLists.txt
+++ b/examples/sql/books/CMakeLists.txt
@@ -1,31 +1,35 @@
 # Generated from books.pro.
 
-#####################################################################
-## books Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(books LANGUAGES CXX)
 
-add_qt_executable(books
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/books"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/books"
-    SOURCES
-        bookdelegate.cpp bookdelegate.h
-        bookwindow.cpp bookwindow.h bookwindow.ui
-        initdb.h
-        main.cpp
-    INCLUDE_DIRECTORIES
-        .
-    PUBLIC_LIBRARIES
-        Qt::Sql
-        Qt::Widgets
-    ENABLE_AUTOGEN_TOOLS
-        uic
-)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
 
-# Resources:
-add_qt_resource(books "books" PREFIX "/" FILES
-    images/star.png)
+set(INSTALL_EXAMPLEDIR "examples")
 
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
 
-#### Keys ignored in scope 1:.:.:books.pro:<TRUE>:
-# TEMPLATE = "app"
+add_executable(books WIN32 MACOSX_BUNDLE
+    bookdelegate.cpp bookdelegate.h
+    books.qrc
+    bookwindow.cpp bookwindow.h bookwindow.ui
+    initdb.h
+    main.cpp
+)
+target_include_directories(books PUBLIC
+    .
+)
+target_link_libraries(books PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS books
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt
index 8e87a32211..3ccea061ff 100644
--- a/examples/sql/cachedtable/CMakeLists.txt
+++ b/examples/sql/cachedtable/CMakeLists.txt
@@ -1,18 +1,30 @@
 # Generated from cachedtable.pro.
 
-#####################################################################
-## cachedtable Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(cachedtable LANGUAGES CXX)
 
-add_qt_executable(cachedtable
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/cachedtable"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/cachedtable"
-    SOURCES
-        ../connection.h
-        main.cpp
-        tableeditor.cpp tableeditor.h
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+
+add_executable(cachedtable WIN32 MACOSX_BUNDLE
+    ../connection.h
+    main.cpp
+    tableeditor.cpp tableeditor.h
+)
+target_link_libraries(cachedtable PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS cachedtable
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt
index a4301d3474..b8fab77b0c 100644
--- a/examples/sql/drilldown/CMakeLists.txt
+++ b/examples/sql/drilldown/CMakeLists.txt
@@ -1,28 +1,33 @@
 # Generated from drilldown.pro.
 
-#####################################################################
-## drilldown Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(drilldown LANGUAGES CXX)
 
-add_qt_executable(drilldown
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/drilldown"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/drilldown"
-    SOURCES
-        ../connection.h
-        imageitem.cpp imageitem.h
-        informationwindow.cpp informationwindow.h
-        main.cpp
-        view.cpp view.h
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
-)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
 
-# Resources:
-add_qt_resource(drilldown "drilldown" PREFIX "/" FILES
-    images/qt-creator.png
-    images/qt-logo.png
-    images/qt-project.png
-    images/qt-quick.png)
+set(INSTALL_EXAMPLEDIR "examples")
 
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+
+add_executable(drilldown WIN32 MACOSX_BUNDLE
+    ../connection.h
+    drilldown.qrc
+    imageitem.cpp imageitem.h
+    informationwindow.cpp informationwindow.h
+    main.cpp
+    view.cpp view.h
+)
+target_link_libraries(drilldown PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS drilldown
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt
index 8c73675e55..d1f4883da1 100644
--- a/examples/sql/masterdetail/CMakeLists.txt
+++ b/examples/sql/masterdetail/CMakeLists.txt
@@ -1,30 +1,34 @@
 # Generated from masterdetail.pro.
 
-#####################################################################
-## masterdetail Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(masterdetail LANGUAGES CXX)
 
-add_qt_executable(masterdetail
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/masterdetail"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/masterdetail"
-    SOURCES
-        database.h
-        dialog.cpp dialog.h
-        main.cpp
-        mainwindow.cpp mainwindow.h
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
-        Qt::Xml
-        Qt::Widgets
-)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
 
-# Resources:
-add_qt_resource(masterdetail "masterdetail" FILES
-    images/icon.png
-    images/image.png)
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+find_package(Qt5 COMPONENTS Xml)
 
+add_executable(masterdetail WIN32 MACOSX_BUNDLE
+    database.h
+    dialog.cpp dialog.h
+    main.cpp
+    mainwindow.cpp mainwindow.h
+    masterdetail.qrc
+)
+target_link_libraries(masterdetail PUBLIC
+    Qt::Sql
+    Qt::Widgets
+    Qt::Xml
+)
 
-#### Keys ignored in scope 1:.:masterdetail.pro:<NONE>:
-# EXAMPLE_FILES = "albumdetails.xml"
+install(TARGETS masterdetail
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt
index 5c9d48c7f1..7f617c7c33 100644
--- a/examples/sql/querymodel/CMakeLists.txt
+++ b/examples/sql/querymodel/CMakeLists.txt
@@ -1,19 +1,31 @@
 # Generated from querymodel.pro.
 
-#####################################################################
-## querymodel Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(querymodel LANGUAGES CXX)
 
-add_qt_executable(querymodel
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/querymodel"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/querymodel"
-    SOURCES
-        ../connection.h
-        customsqlmodel.cpp customsqlmodel.h
-        editablesqlmodel.cpp editablesqlmodel.h
-        main.cpp
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+
+add_executable(querymodel WIN32 MACOSX_BUNDLE
+    ../connection.h
+    customsqlmodel.cpp customsqlmodel.h
+    editablesqlmodel.cpp editablesqlmodel.h
+    main.cpp
+)
+target_link_libraries(querymodel PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS querymodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt
index d31042cc73..de4dba49cc 100644
--- a/examples/sql/relationaltablemodel/CMakeLists.txt
+++ b/examples/sql/relationaltablemodel/CMakeLists.txt
@@ -1,17 +1,29 @@
 # Generated from relationaltablemodel.pro.
 
-#####################################################################
-## relationaltablemodel Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(relationaltablemodel LANGUAGES CXX)
 
-add_qt_executable(relationaltablemodel
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/relationaltablemodel"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/relationaltablemodel"
-    SOURCES
-        ../connection.h
-        relationaltablemodel.cpp
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+
+add_executable(relationaltablemodel WIN32 MACOSX_BUNDLE
+    ../connection.h
+    relationaltablemodel.cpp
+)
+target_link_libraries(relationaltablemodel PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS relationaltablemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt
index a2e0ed951d..dee4d4a58e 100644
--- a/examples/sql/sqlbrowser/CMakeLists.txt
+++ b/examples/sql/sqlbrowser/CMakeLists.txt
@@ -1,31 +1,32 @@
 # Generated from sqlbrowser.pro.
 
-#####################################################################
-## sqlbrowser Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(sqlbrowser LANGUAGES CXX)
 
-add_qt_executable(sqlbrowser
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/sqlbrowser"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/sqlbrowser"
-    SOURCES
-        browser.cpp browser.h
-        browserwidget.ui
-        connectionwidget.cpp connectionwidget.h
-        main.cpp
-        qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui
-    PUBLIC_LIBRARIES
-        Qt::Sql
-        Qt::Widgets
-    ENABLE_AUTOGEN_TOOLS
-        uic
-)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
 
-#### Keys ignored in scope 1:.:.:sqlbrowser.pro:<TRUE>:
-# TEMPLATE = "app"
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
 
-## Scopes:
-#####################################################################
+add_executable(sqlbrowser WIN32 MACOSX_BUNDLE
+    browser.cpp browser.h
+    browserwidget.ui
+    connectionwidget.cpp connectionwidget.h
+    main.cpp
+    qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui
+)
+target_link_libraries(sqlbrowser PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
 
-#### Keys ignored in scope 2:.:.:sqlbrowser.pro:build_all AND NOT build_pass:
-# CONFIG = "-build_all" "release"
+install(TARGETS sqlbrowser
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt
index 41d95da21e..586592fb18 100644
--- a/examples/sql/sqlwidgetmapper/CMakeLists.txt
+++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt
@@ -1,17 +1,29 @@
 # Generated from sqlwidgetmapper.pro.
 
-#####################################################################
-## sqlwidgetmapper Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(sqlwidgetmapper LANGUAGES CXX)
 
-add_qt_executable(sqlwidgetmapper
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/sqlwidgetmapper"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/sqlwidgetmapper"
-    SOURCES
-        main.cpp
-        window.cpp window.h
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+
+add_executable(sqlwidgetmapper WIN32 MACOSX_BUNDLE
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(sqlwidgetmapper PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS sqlwidgetmapper
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt
index 68644a4b3d..9972927166 100644
--- a/examples/sql/tablemodel/CMakeLists.txt
+++ b/examples/sql/tablemodel/CMakeLists.txt
@@ -1,17 +1,29 @@
 # Generated from tablemodel.pro.
 
-#####################################################################
-## tablemodel Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(tablemodel LANGUAGES CXX)
 
-add_qt_executable(tablemodel
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/tablemodel"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/sql/tablemodel"
-    SOURCES
-        ../connection.h
-        tablemodel.cpp
-    LIBRARIES
-        Qt::Sql
-        Qt::Widgets
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS Sql)
+find_package(Qt5 COMPONENTS Widgets)
+
+add_executable(tablemodel WIN32 MACOSX_BUNDLE
+    ../connection.h
+    tablemodel.cpp
+)
+target_link_libraries(tablemodel PUBLIC
+    Qt::Sql
+    Qt::Widgets
+)
+
+install(TARGETS tablemodel
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )