diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 12:59:07 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-14 16:31:09 +0200 |
commit | fe3bd212fc85b6c3a64bb8bd5beca4ff4d3493a1 (patch) | |
tree | b96dd84abfb6ac25b26539999bf2d7d427f347dd /examples/sql | |
parent | 72066a3a585b4f4fed499c64464ca5ad2ba9f71d (diff) | |
parent | ae97d11589dd03edeea0475163e6110869143b35 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
This changes many different CMake places to mention Qt6 instead of
Qt5.
Note that some old qt5 cmake config files in corelib are probably not
needed anymore, but I still renamed and kept them for now.
Change-Id: Ie69e81540386a5af153f76c0242e18d48211bec4
Diffstat (limited to 'examples/sql')
-rw-r--r-- | examples/sql/books/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/cachedtable/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/drilldown/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/masterdetail/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/sql/querymodel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/relationaltablemodel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/sqlbrowser/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/sqlwidgetmapper/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/sql/tablemodel/CMakeLists.txt | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt index e9044e34b8..5890c6c85f 100644 --- a/examples/sql/books/CMakeLists.txt +++ b/examples/sql/books/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(books bookdelegate.cpp bookdelegate.h diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt index f3341791a1..512c7c4891 100644 --- a/examples/sql/cachedtable/CMakeLists.txt +++ b/examples/sql/cachedtable/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(cachedtable ../connection.h diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt index 97a2620209..128ebc107f 100644 --- a/examples/sql/drilldown/CMakeLists.txt +++ b/examples/sql/drilldown/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(drilldown ../connection.h diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt index 59ce1eb77d..a142d41d5f 100644 --- a/examples/sql/masterdetail/CMakeLists.txt +++ b/examples/sql/masterdetail/CMakeLists.txt @@ -11,9 +11,9 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) -find_package(Qt5 COMPONENTS Xml) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Xml) add_qt_gui_executable(masterdetail database.h diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt index 1f7bb512fc..a31abc40fc 100644 --- a/examples/sql/querymodel/CMakeLists.txt +++ b/examples/sql/querymodel/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(querymodel ../connection.h diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt index 6a9840b9df..fbdab96aff 100644 --- a/examples/sql/relationaltablemodel/CMakeLists.txt +++ b/examples/sql/relationaltablemodel/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(relationaltablemodel ../connection.h diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt index 3f4d7cf908..b9aae1c7eb 100644 --- a/examples/sql/sqlbrowser/CMakeLists.txt +++ b/examples/sql/sqlbrowser/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(sqlbrowser browser.cpp browser.h diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt index 0ec052db0a..ad0d5cfce9 100644 --- a/examples/sql/sqlwidgetmapper/CMakeLists.txt +++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(sqlwidgetmapper main.cpp diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt index 8f7cfa3439..9e90e56b7f 100644 --- a/examples/sql/tablemodel/CMakeLists.txt +++ b/examples/sql/tablemodel/CMakeLists.txt @@ -11,8 +11,8 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -find_package(Qt5 COMPONENTS Sql) -find_package(Qt5 COMPONENTS Widgets) +find_package(Qt6 COMPONENTS Sql) +find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(tablemodel ../connection.h |