diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-02 18:00:53 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-08 23:39:18 +0000 |
commit | 392b338f15a144b5ec611612b092366c0f42b9f2 (patch) | |
tree | 8d141f673cedce0f3dbac582e4cbf3b2c890370d /src | |
parent | 626a4d89c2aec6354db9602ad1816e7f7e13d9b1 (diff) |
move qfontengine_ft.* from gui to platformsupport
that's where the files are actually used nowadays.
also removes an obsolete (and bogus) gui export.
Change-Id: I4551aad798acb6ce8c0abe43a2fcb8e5ac64a2d4
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/platformsupport/fontdatabases/basic/basic.pri | 4 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 3 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/basic/qfontengine_ft.cpp (renamed from src/gui/text/qfontengine_ft.cpp) | 0 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/basic/qfontengine_ft_p.h (renamed from src/gui/text/qfontengine_ft_p.h) | 6 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 3 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/mac/coretext.pri | 4 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp | 3 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp | 3 |
10 files changed, 13 insertions, 17 deletions
diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri index c50dba3ce2..d16aabb4c7 100644 --- a/src/platformsupport/fontdatabases/basic/basic.pri +++ b/src/platformsupport/fontdatabases/basic/basic.pri @@ -1,9 +1,9 @@ HEADERS += \ $$PWD/qbasicfontdatabase_p.h \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h + $$PWD/qfontengine_ft_p.h SOURCES += \ $$PWD/qbasicfontdatabase.cpp \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp + $$PWD/qfontengine_ft.cpp QMAKE_USE += freetype diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index 60ddc9fa23..0826b0f2fb 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -49,8 +49,7 @@ #include <QtCore/QtEndian> #undef QT_NO_FREETYPE -#include <QtGui/private/qfontengine_ft_p.h> -#include <QtGui/private/qfontengine_p.h> +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> #include <ft2build.h> #include FT_TRUETYPE_TABLES_H diff --git a/src/gui/text/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/basic/qfontengine_ft.cpp index de6da88245..de6da88245 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/platformsupport/fontdatabases/basic/qfontengine_ft.cpp diff --git a/src/gui/text/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/basic/qfontengine_ft_p.h index 32357d0076..c5f3b0443e 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/platformsupport/fontdatabases/basic/qfontengine_ft_p.h @@ -126,13 +126,7 @@ private: QFontEngine::Holder hbFace; }; -// If this is exported this breaks compilation of the windows -// plugin as qfontengine_ft_p.h/.cpp are also compiled there -#ifndef Q_OS_WIN -class Q_GUI_EXPORT QFontEngineFT : public QFontEngine -#else class QFontEngineFT : public QFontEngine -#endif { public: diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 65bc494e91..2c5ce3e87d 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -40,6 +40,8 @@ #include "qfontconfigdatabase_p.h" #include "qfontenginemultifontconfig_p.h" +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> + #include <QtCore/QList> #include <QtCore/QElapsedTimer> #include <QtCore/QFile> @@ -49,7 +51,6 @@ #include <qpa/qplatformintegration.h> #include <qpa/qplatformservices.h> -#include <QtGui/private/qfontengine_ft_p.h> #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qhighdpiscaling_p.h> diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp index 7574f9f9e6..2fbcb6216e 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp @@ -39,7 +39,7 @@ #include "qfontenginemultifontconfig_p.h" -#include <QtGui/private/qfontengine_ft_p.h> +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri index 1caeb2c1ac..f4e9404371 100644 --- a/src/platformsupport/fontdatabases/mac/coretext.pri +++ b/src/platformsupport/fontdatabases/mac/coretext.pri @@ -3,8 +3,8 @@ OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.m qtConfig(freetype) { QMAKE_USE += freetype - HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h - SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp + HEADERS += basic/qfontengine_ft_p.h + SOURCES += basic/qfontengine_ft.cpp } uikit: \ diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 1e29b12ec4..3d94982f60 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -53,7 +53,7 @@ #include <QtCore/QSettings> #include <QtCore/QtEndian> #ifndef QT_NO_FREETYPE -#include <QtGui/private/qfontengine_ft_p.h> +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp index 7cfebf0436..65947ab7da 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp @@ -40,6 +40,8 @@ #include "qwindowsfontdatabase_ft_p.h" #include "qwindowsfontdatabase_p.h" +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> + #include <ft2build.h> #include FT_TRUETYPE_TABLES_H @@ -47,7 +49,6 @@ #include <QtCore/QDirIterator> #include <QtCore/QSettings> #include <QtCore/QRegularExpression> -#include <QtGui/private/qfontengine_ft_p.h> #include <QtGui/QGuiApplication> #include <QtGui/QFontDatabase> diff --git a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp index 9f4b182ece..eb5a38855e 100644 --- a/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp @@ -39,11 +39,12 @@ #include "qwinrtfontdatabase_p.h" +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> + #include <QtCore/QCoreApplication> #include <QtCore/QFile> #include <QtCore/QUuid> -#include <QtGui/private/qfontengine_ft_p.h> #include <dwrite_1.h> #include <wrl.h> using namespace Microsoft::WRL; |