diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-04 08:15:50 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-04 18:50:39 +0000 |
commit | 76108058796bf0884f6fd128d81f1bc49f9a56af (patch) | |
tree | 1c5f0740ca3217f3d11cf7c684143bbb0da0f336 /examples/sql | |
parent | 465949420a877099247d94dd4db54d19ca5a9a7c (diff) |
Regenerate examples
Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/sql')
-rw-r--r-- | examples/sql/books/CMakeLists.txt | 21 | ||||
-rw-r--r-- | examples/sql/cachedtable/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/sql/drilldown/CMakeLists.txt | 23 | ||||
-rw-r--r-- | examples/sql/masterdetail/CMakeLists.txt | 21 | ||||
-rw-r--r-- | examples/sql/querymodel/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/sql/relationaltablemodel/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/sql/sqlbrowser/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/sql/sqlwidgetmapper/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/sql/tablemodel/CMakeLists.txt | 6 |
9 files changed, 89 insertions, 12 deletions
diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt index 5890c6c85f..870d90bf14 100644 --- a/examples/sql/books/CMakeLists.txt +++ b/examples/sql/books/CMakeLists.txt @@ -9,14 +9,15 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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 - books.qrc bookwindow.cpp bookwindow.h bookwindow.ui initdb.h main.cpp @@ -24,11 +25,27 @@ add_qt_gui_executable(books 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}" diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt index 512c7c4891..872c462fdd 100644 --- a/examples/sql/cachedtable/CMakeLists.txt +++ b/examples/sql/cachedtable/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -20,6 +22,8 @@ add_qt_gui_executable(cachedtable tableeditor.cpp tableeditor.h ) target_link_libraries(cachedtable PUBLIC + Qt::Core + Qt::Gui Qt::Sql Qt::Widgets ) diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt index 128ebc107f..5b6bea0423 100644 --- a/examples/sql/drilldown/CMakeLists.txt +++ b/examples/sql/drilldown/CMakeLists.txt @@ -9,24 +9,43 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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 - drilldown.qrc 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}" diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt index a142d41d5f..7052461601 100644 --- a/examples/sql/masterdetail/CMakeLists.txt +++ b/examples/sql/masterdetail/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -20,14 +22,29 @@ add_qt_gui_executable(masterdetail dialog.cpp dialog.h main.cpp mainwindow.cpp mainwindow.h - masterdetail.qrc ) 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}" diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt index a31abc40fc..e4127baeef 100644 --- a/examples/sql/querymodel/CMakeLists.txt +++ b/examples/sql/querymodel/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -21,6 +23,8 @@ add_qt_gui_executable(querymodel main.cpp ) target_link_libraries(querymodel PUBLIC + Qt::Core + Qt::Gui Qt::Sql Qt::Widgets ) diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt index fbdab96aff..c758f3c32d 100644 --- a/examples/sql/relationaltablemodel/CMakeLists.txt +++ b/examples/sql/relationaltablemodel/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -19,6 +21,8 @@ add_qt_gui_executable(relationaltablemodel relationaltablemodel.cpp ) target_link_libraries(relationaltablemodel PUBLIC + Qt::Core + Qt::Gui Qt::Sql Qt::Widgets ) diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt index b9aae1c7eb..833b57f1a1 100644 --- a/examples/sql/sqlbrowser/CMakeLists.txt +++ b/examples/sql/sqlbrowser/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -22,6 +24,8 @@ add_qt_gui_executable(sqlbrowser qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui ) target_link_libraries(sqlbrowser PUBLIC + Qt::Core + Qt::Gui Qt::Sql Qt::Widgets ) diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt index ad0d5cfce9..8d8a1a82ed 100644 --- a/examples/sql/sqlwidgetmapper/CMakeLists.txt +++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -19,6 +21,8 @@ add_qt_gui_executable(sqlwidgetmapper window.cpp window.h ) target_link_libraries(sqlwidgetmapper PUBLIC + Qt::Core + Qt::Gui Qt::Sql Qt::Widgets ) diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt index 9e90e56b7f..85e1bd9167 100644 --- a/examples/sql/tablemodel/CMakeLists.txt +++ b/examples/sql/tablemodel/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +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) @@ -19,6 +21,8 @@ add_qt_gui_executable(tablemodel tablemodel.cpp ) target_link_libraries(tablemodel PUBLIC + Qt::Core + Qt::Gui Qt::Sql Qt::Widgets ) |