summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/fontdatabases
diff options
context:
space:
mode:
Diffstat (limited to 'src/platformsupport/fontdatabases')
-rw-r--r--src/platformsupport/fontdatabases/.prev_CMakeLists.txt11
-rw-r--r--src/platformsupport/fontdatabases/CMakeLists.txt11
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
)