Martchus
defbb48223
* Make it possible to use shared and static Qt build (installed in the same prefix) at the same time in a project. * This allows compiling shared and static libraries depending on Qt in one step. * Static CMake modules are prefixed with 'Static', eg. 'StaticQt5Core' and provide importet targets as eg. 'Qt5::static::Core'.
23 lines
785 B
Diff
23 lines
785 B
Diff
From ce1268a5bce5652761fc2a54e4e361bc003befec Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Thu, 6 Aug 2015 23:35:08 +0200
|
|
Subject: [PATCH 01/25] Fix qwindows plugin linking with system-freetype
|
|
|
|
---
|
|
src/3rdparty/freetype_dependency.pri | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
|
|
index 39280de..e152b0d 100644
|
|
--- a/src/3rdparty/freetype_dependency.pri
|
|
+++ b/src/3rdparty/freetype_dependency.pri
|
|
@@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) {
|
|
} else:contains(QT_CONFIG, system-freetype) {
|
|
# pull in the proper freetype2 include directory
|
|
include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
|
|
+ win32:shared:LIBS_PRIVATE += -lfreetype
|
|
}
|
|
--
|
|
2.10.1
|
|
|