AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup related to transitive dependencies

Browse Source 
public uses of external libraries are automatically transitive now, so
we can remove some parts which were only meant to pull in transitive
dependencies manually.

this is particularly good for includes() of parts of QtPlatformSupport,
which actually redundantly pulled in the library's sources.

this required making the freetype and fontconfig dependencies public,
which is ok, as in the end, they are used only by platform plugins, so
there is no point in making them private, as plugins are not linked
against anyway (except statically, but there public vs. private doesn't
apply anyway).

Change-Id: Ia2a32f50dc0f8472285675a0903e6ecd142a03b2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-10-12 11:39:26 +02:00 committed by Oswald Buddenhagen
parent cd62d2810b
commit ec774500fb
7 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qpa/basicunixfontdatabase.prf
View File

@ -1,3 +1,3 @@
qtConfig(system-freetype) {
QMAKE_USE_PRIVATE += freetype/linkonly
QMAKE_USE += freetype/linkonly
}

2
mkspecs/features/qpa/genericunixfontdatabase.prf
View File

@ -1,5 +1,5 @@
CONFIG += qpa/basicunixfontdatabase
qtConfig(fontconfig) {
QMAKE_USE_PRIVATE += fontconfig/linkonly
QMAKE_USE += fontconfig/linkonly
}

4
src/3rdparty/freetype_dependency.pri vendored
View File

@ -1,5 +1,5 @@
qtConfig(system-freetype) {
QMAKE_USE_PRIVATE += freetype/nolink
QMAKE_USE += freetype/nolink
} else: qtConfig(freetype) {
QMAKE_USE_PRIVATE += freetype
QMAKE_USE += freetype
}

2
src/plugins/platforms/haiku/haiku.pro
View File

@ -36,8 +36,6 @@ LIBS += -lbe
OTHER_FILES += haiku.json
include (../../../platformsupport/fontdatabases/fontdatabases.pri)
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QHaikuIntegrationPlugin
load(qt_plugin)

5
src/plugins/platforms/qnx/qnx.pro
View File

@ -121,11 +121,6 @@ lgmon {
OTHER_FILES += qnx.json
QMAKE_CXXFLAGS += -I./private
include (../../../platformsupport/eglconvenience/eglconvenience.pri)
include (../../../platformsupport/fontdatabases/fontdatabases.pri)
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QQnxIntegrationPlugin
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -

5
src/plugins/platforms/windows/windows.pri
View File

@ -114,11 +114,6 @@ RESOURCES += $$PWD/openglblacklists.qrc
qtConfig(freetype) {
HEADERS += $$PWD/qwindowsfontdatabase_ft.h
SOURCES += $$PWD/qwindowsfontdatabase_ft.cpp
qtConfig(system-freetype) {
include($$QT_SOURCE_TREE/src/platformsupport/fontdatabases/basic/basic.pri)
} else {
include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
}
}
qtConfig(accessibility): include($$PWD/accessible/accessible.pri)

1
src/plugins/platforms/winrt/winrt.pro
View File

@ -7,7 +7,6 @@ QT += core-private gui-private platformsupport-private
DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
LIBS += $$QMAKE_LIBS_CORE -ldwrite -ld3d11
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/freetype/include
SOURCES = \
main.cpp \