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 /tests/manual/rhi/computeimage/CMakeLists.txt | |
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 'tests/manual/rhi/computeimage/CMakeLists.txt')
-rw-r--r-- | tests/manual/rhi/computeimage/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt index ffb99b8d1c..a634f1cf98 100644 --- a/tests/manual/rhi/computeimage/CMakeLists.txt +++ b/tests/manual/rhi/computeimage/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(computeimage GUI SOURCES computeimage.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: |