diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-02 16:29:51 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-08 23:39:24 +0000 |
| commit | 5152c3ca82a0f47273e3bfc59a5a29e0503ed7dd (patch) | |
| tree | 134fb6d4bd1375937373c30460a5669bb685bef5 /src | |
| parent | 392b338f15a144b5ec611612b092366c0f42b9f2 (diff) | |
make freetype & fontconfig dependencies private again
exporting the freetype dependency caused qtwayland to break with
-qt-freetype, as the helper libraries' module pri files are not
installed (for good reasons)
after f9a80e06a, no actual user of FontDatabaseSupport needs access to
the transitive dependencies anyway (one of the headers has a fontconfig
dependency, but it's not used outside the module itself), so hiding them
again is just fine.
this partially reverts ec774500f.
Task-number: QTBUG-56666
Change-Id: I9e68a7e0725a92833b856c9ffdbec61c8aa5fed2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/basic.pri | 2 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/fontconfig.pri | 2 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/coretext.pri | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri index d16aabb4c7..0617bf74d7 100644 --- a/src/platformsupport/fontdatabases/basic/basic.pri +++ b/src/platformsupport/fontdatabases/basic/basic.pri @@ -6,4 +6,4 @@ SOURCES += \ $$PWD/qbasicfontdatabase.cpp \ $$PWD/qfontengine_ft.cpp -QMAKE_USE += freetype +QMAKE_USE_PRIVATE += freetype diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri index 6458464870..671d6be237 100644 --- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri +++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri @@ -3,4 +3,4 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \ SOURCES += $$PWD/qfontconfigdatabase.cpp \ $$PWD/qfontenginemultifontconfig.cpp -QMAKE_USE += fontconfig +QMAKE_USE_PRIVATE += fontconfig diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index f4e9404371..50dafc3f89 100644 --- a/src/platformsupport/fontdatabases/mac/coretext.pri +++ b/src/platformsupport/fontdatabases/mac/coretext.pri @@ -2,7 +2,7 @@ HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm qtConfig(freetype) { - QMAKE_USE += freetype + QMAKE_USE_PRIVATE += freetype HEADERS += basic/qfontengine_ft_p.h SOURCES += basic/qfontengine_ft.cpp } |