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/auto/gui/text/qtextscriptengine | |
| 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/auto/gui/text/qtextscriptengine')
| -rw-r--r-- | tests/auto/gui/text/qtextscriptengine/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt index 1a3b8cfa92..8d94e33b6c 100644 --- a/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/CMakeLists.txt @@ -7,9 +7,8 @@ add_qt_test(tst_qtextscriptengine SOURCES tst_qtextscriptengine.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) diff --git a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt index bdda60149c..b2434569d4 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt +++ b/tests/auto/gui/text/qtextscriptengine/generate/CMakeLists.txt @@ -11,8 +11,7 @@ add_qt_executable(generate INCLUDE_DIRECTORIES . /usr/include/freetype2 - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui ) |