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>

21 files changed, 21 insertions, 21 deletions

diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt
index 026c2406a4..2831e860a5 100644
--- a/examples/widgets/itemviews/addressbook/CMakeLists.txt
+++ b/examples/widgets/itemviews/addressbook/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(addressbook WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(addressbook WIN32 MACOSX_BUNDLE
     adddialog.cpp adddialog.h
     addresswidget.cpp addresswidget.h
     main.cpp
diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
index 2efba58b10..8c4d84431e 100644
--- a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(basicsortfiltermodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(basicsortfiltermodel WIN32 MACOSX_BUNDLE
     main.cpp
     window.cpp window.h
 )
diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt
index 79c489b03e..7aceadab54 100644
--- a/examples/widgets/itemviews/chart/CMakeLists.txt
+++ b/examples/widgets/itemviews/chart/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(chart WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(chart WIN32 MACOSX_BUNDLE
     chart.qrc
     main.cpp
     mainwindow.cpp mainwindow.h
diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
index c33cc61118..e3cea3e235 100644
--- a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
+++ b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(coloreditorfactory WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(coloreditorfactory WIN32 MACOSX_BUNDLE
     colorlisteditor.cpp colorlisteditor.h
     main.cpp
     window.cpp window.h
diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
index 7cce164bc6..175f78e773 100644
--- a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
+++ b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(combowidgetmapper WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(combowidgetmapper WIN32 MACOSX_BUNDLE
     main.cpp
     window.cpp window.h
 )
diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
index 0aa34c46d8..2c3627657a 100644
--- a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(customsortfiltermodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(customsortfiltermodel WIN32 MACOSX_BUNDLE
     customsortfiltermodel.qrc
     filterwidget.cpp filterwidget.h
     main.cpp
diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt
index 3e6e7c9ac7..105d420f1a 100644
--- a/examples/widgets/itemviews/dirview/CMakeLists.txt
+++ b/examples/widgets/itemviews/dirview/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(dirview WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(dirview WIN32 MACOSX_BUNDLE
     main.cpp
 )
 target_link_libraries(dirview PUBLIC
diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
index c86c0d7272..f3e574c811 100644
--- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(editabletreemodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(editabletreemodel WIN32 MACOSX_BUNDLE
     editabletreemodel.qrc
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt
index 5013d5bab2..be2771970a 100644
--- a/examples/widgets/itemviews/fetchmore/CMakeLists.txt
+++ b/examples/widgets/itemviews/fetchmore/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(fetchmore WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(fetchmore WIN32 MACOSX_BUNDLE
     filelistmodel.cpp filelistmodel.h
     main.cpp
     window.cpp window.h
diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt
index afcb66a6b2..b026b2442f 100644
--- a/examples/widgets/itemviews/flattreeview/CMakeLists.txt
+++ b/examples/widgets/itemviews/flattreeview/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(flattreeview WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(flattreeview WIN32 MACOSX_BUNDLE
     main.cpp
 )
 target_link_libraries(flattreeview PUBLIC
diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
index a17ffef5fc..fee5570bd6 100644
--- a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
+++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(frozencolumn WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(frozencolumn WIN32 MACOSX_BUNDLE
     freezetablewidget.cpp freezetablewidget.h
     grades.qrc
     main.cpp
diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt
index f14bded157..76a145c7d8 100644
--- a/examples/widgets/itemviews/interview/CMakeLists.txt
+++ b/examples/widgets/itemviews/interview/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(interview WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(interview WIN32 MACOSX_BUNDLE
     interview.qrc
     main.cpp
     model.cpp model.h
diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt
index e9a04a0807..e3e3388ba9 100644
--- a/examples/widgets/itemviews/pixelator/CMakeLists.txt
+++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS PrintSupport) # special case
 
-add_executable(pixelator WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(pixelator WIN32 MACOSX_BUNDLE
     imagemodel.cpp imagemodel.h
     images.qrc
     main.cpp
diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt
index cffbdbb1b0..77abd09eaf 100644
--- a/examples/widgets/itemviews/puzzle/CMakeLists.txt
+++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(itemviews_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle
+add_qt_gui_executable(itemviews_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle
     main.cpp
     mainwindow.cpp mainwindow.h
     piecesmodel.cpp piecesmodel.h
diff --git a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
index 4a1812d96d..3573eca461 100644
--- a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Xml)
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(simpledommodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(simpledommodel WIN32 MACOSX_BUNDLE
     domitem.cpp domitem.h
     dommodel.cpp dommodel.h
     main.cpp
diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
index 3fb889229d..34c59d55ae 100644
--- a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
+++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(simpletreemodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(simpletreemodel WIN32 MACOSX_BUNDLE
     main.cpp
     simpletreemodel.qrc
     treeitem.cpp treeitem.h
diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
index d25d491544..dedf063b5f 100644
--- a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
+++ b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(simplewidgetmapper WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(simplewidgetmapper WIN32 MACOSX_BUNDLE
     main.cpp
     window.cpp window.h
 )
diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
index 809c1cd0d0..ed2ebc8ab3 100644
--- a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
+++ b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(spinboxdelegate WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(spinboxdelegate WIN32 MACOSX_BUNDLE
     delegate.cpp delegate.h
     main.cpp
 )
diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
index 811caec6a6..7e3676e780 100644
--- a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
+++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt
@@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS PrintSupport) # special case
 
-add_executable(spreadsheet WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(spreadsheet WIN32 MACOSX_BUNDLE
     main.cpp
     printview.cpp printview.h
     spreadsheet.cpp spreadsheet.h spreadsheet.qrc
diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt
index 8cfb991143..0d3bc684f8 100644
--- a/examples/widgets/itemviews/stardelegate/CMakeLists.txt
+++ b/examples/widgets/itemviews/stardelegate/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(stardelegate WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(stardelegate WIN32 MACOSX_BUNDLE
     main.cpp
     stardelegate.cpp stardelegate.h
     stareditor.cpp stareditor.h
diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt
index d25d839347..b254a217bc 100644
--- a/examples/widgets/itemviews/storageview/CMakeLists.txt
+++ b/examples/widgets/itemviews/storageview/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Core)
 find_package(Qt5 COMPONENTS Gui)
 find_package(Qt5 COMPONENTS Widgets)
 
-add_executable(storageview WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(storageview WIN32 MACOSX_BUNDLE
     main.cpp
     storagemodel.cpp storagemodel.h
 )