summaryrefslogtreecommitdiffstats
path: root/examples/widgets/tutorials/modelview
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-06-11 15:46:31 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-06-12 14:19:34 +0000
commit6732fa3a291e77acad3ab6ba829d1026462dc139 (patch)
treeeae7522ffebf148907ff58421ea4681e7726f99a /examples/widgets/tutorials/modelview
parent82840d2660202c6d8f3c53ad1d620667901cb954 (diff)
Fix linking of examples
Provide add_qt_gui_executable() as function in our public API that takes care of automaticWinMain linkage. We can use this in the future to encapsulate similarplatform-specific behavior and adjustments, such as module generation onAndroid. In order for the examples to see the function in Qt5CoreMacros, three more additional fixes were required: * Do the build_repo_end() call _before_ attempting to build the examples, as we need the build_repo_end() to include QtPostProcess and complete the creation of all the target config files. Otherwise the find_package() calls in the examples see something incomplete. * Add more QT_NO_CREATE_TARGET guards * Always call find_dependency on the dependencies, regardless of the target creation mode. This way a find_package(Qt5 COMPONENTS Widgets) will still load Qt5CoreMacros. Change-Id: I03ce856e2f4312a050fe8043b8331cbe8a6c93e6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/widgets/tutorials/modelview')
-rw-r--r--examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt2
-rw-r--r--examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt2
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt
index 82e1b4dbab..ee859409e5 100644
--- a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_readonly WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_readonly WIN32 MACOSX_BUNDLE
main.cpp
mymodel.cpp mymodel.h
)
diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt
index 898df9bfbf..75c5f431c1 100644
--- a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_formatting WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_formatting WIN32 MACOSX_BUNDLE
main.cpp
mymodel.cpp mymodel.h
)
diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt
index b460b7b281..60d240f170 100644
--- a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_changingmodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_changingmodel WIN32 MACOSX_BUNDLE
main.cpp
mymodel.cpp mymodel.h
)
diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt
index e76299ee0c..b719caf8ec 100644
--- a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_headers WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_headers WIN32 MACOSX_BUNDLE
main.cpp
mymodel.cpp mymodel.h
)
diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt
index ceb2ef0ed5..67c34521f4 100644
--- a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_edit WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_edit WIN32 MACOSX_BUNDLE
main.cpp
mainwindow.cpp mainwindow.h
mymodel.cpp mymodel.h
diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt
index f6409036fd..2feb364569 100644
--- a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_tree WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_tree WIN32 MACOSX_BUNDLE
main.cpp
mainwindow.cpp mainwindow.h
)
diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt
index f328863a1f..a974313bd7 100644
--- a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt
+++ b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
find_package(Qt5 COMPONENTS Widgets)
-add_executable(mv_selections WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mv_selections WIN32 MACOSX_BUNDLE
main.cpp
mainwindow.cpp mainwindow.h
)