diff options
-rw-r--r-- | mkspecs/features/qpa/basicunixfontdatabase.prf | 2 | ||||
-rw-r--r-- | mkspecs/features/qpa/genericunixfontdatabase.prf | 2 | ||||
-rw-r--r-- | src/3rdparty/freetype_dependency.pri | 4 | ||||
-rw-r--r-- | src/plugins/platforms/haiku/haiku.pro | 2 | ||||
-rw-r--r-- | src/plugins/platforms/qnx/qnx.pro | 5 | ||||
-rw-r--r-- | src/plugins/platforms/windows/windows.pri | 5 | ||||
-rw-r--r-- | src/plugins/platforms/winrt/winrt.pro | 1 |
7 files changed, 4 insertions, 17 deletions
diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf index 72449c8f6b..327cd927d8 100644 --- a/mkspecs/features/qpa/basicunixfontdatabase.prf +++ b/mkspecs/features/qpa/basicunixfontdatabase.prf @@ -1,3 +1,3 @@ qtConfig(system-freetype) { - QMAKE_USE_PRIVATE += freetype/linkonly + QMAKE_USE += freetype/linkonly } diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf index 3b34eb0624..f5e54618aa 100644 --- a/mkspecs/features/qpa/genericunixfontdatabase.prf +++ b/mkspecs/features/qpa/genericunixfontdatabase.prf @@ -1,5 +1,5 @@ CONFIG += qpa/basicunixfontdatabase qtConfig(fontconfig) { - QMAKE_USE_PRIVATE += fontconfig/linkonly + QMAKE_USE += fontconfig/linkonly } diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri index ca871a92d7..c477e6fdea 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -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 } diff --git a/src/plugins/platforms/haiku/haiku.pro b/src/plugins/platforms/haiku/haiku.pro index ea5bb632db..931dfb28a8 100644 --- a/src/plugins/platforms/haiku/haiku.pro +++ b/src/plugins/platforms/haiku/haiku.pro @@ -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) diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index e47731476f..a726980f5b 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -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 = - diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 6929f7365f..411c9e032b 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -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) diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro index 28456f66ec..174b0362b4 100644 --- a/src/plugins/platforms/winrt/winrt.pro +++ b/src/plugins/platforms/winrt/winrt.pro @@ -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 \ |