diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:27:47 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:29:51 +0100 |
| commit | c53ee1f054fee2d6092c5e24b5b6b131dbd0457b (patch) | |
| tree | ffdc87c81c72b545602c7380bbde3f0ab5c499e0 /examples | |
| parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) | |
| parent | 0d177053b9406e2fb21802d23f2b2cdc0f974377 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
Hopefully final merge from wip/cmake, and then all cmake changes
should target dev directly.
Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/hellowindow/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | examples/qpa/windows/CMakeLists.txt | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/examples/opengl/hellowindow/CMakeLists.txt index 95f627be9d..58bd3fc362 100644 --- a/examples/opengl/hellowindow/CMakeLists.txt +++ b/examples/opengl/hellowindow/CMakeLists.txt @@ -18,14 +18,11 @@ add_qt_gui_executable(hellowindow hellowindow.cpp hellowindow.h main.cpp ) -target_link_libraries(hellowindow PRIVATE - Qt::CorePrivate - Qt::GuiPrivate -) - target_link_libraries(hellowindow PUBLIC Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) install(TARGETS hellowindow diff --git a/examples/qpa/windows/CMakeLists.txt b/examples/qpa/windows/CMakeLists.txt index 6f9bbe7534..4eeab0e3bc 100644 --- a/examples/qpa/windows/CMakeLists.txt +++ b/examples/qpa/windows/CMakeLists.txt @@ -18,14 +18,11 @@ add_executable(windows main.cpp window.cpp window.h ) -target_link_libraries(windows PRIVATE - Qt::CorePrivate - Qt::GuiPrivate -) - target_link_libraries(windows PUBLIC Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) install(TARGETS windows |