diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /src/platformsupport/fontdatabases | |
parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'src/platformsupport/fontdatabases')
-rw-r--r-- | src/platformsupport/fontdatabases/.prev_CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/CMakeLists.txt | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index f6ee30269d..ae7d22260c 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -9,12 +9,9 @@ qt_add_module(FontDatabaseSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -73,13 +70,12 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES - Qt::GuiPrivate advapi32 gdi32 ole32 user32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT @@ -122,9 +118,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WINRT DEFINES __WRL_NO_DEFAULT_LIB__ LIBRARIES - Qt::GuiPrivate dwrite_1 ws2_32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index 271cdde5d4..dd836c1e6d 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_module(FontDatabaseSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -76,13 +73,12 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h LIBRARIES - Qt::GuiPrivate advapi32 gdi32 ole32 user32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT @@ -125,9 +121,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WINRT DEFINES __WRL_NO_DEFAULT_LIB__ LIBRARIES - Qt::GuiPrivate dwrite_1 ws2_32 PUBLIC_LIBRARIES - Qt::Gui + Qt::GuiPrivate ) |