diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-30 12:24:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 06:14:19 +0200 |
| commit | 006edbd0d948e96713c2f983d2cedfa0c1798f61 (patch) | |
| tree | 34ef6b523922390e2fd3e0359e5172cab3e91721 /src/plugins | |
| parent | 9b07fd0d5cae6846f0eaccf3dc51bc9e78559a05 (diff) | |
The QFontEngineFT files are not built into QtGui anymore.
These files are only built into QtPlatformSupport, so the Q_GUI_EXPORT
macro is now wrong. Remove it.
Additionally, since these files are built into QtPlatformSupport, the
windows platform plugin does not need to build them again.
To-Do: move the files to src/platformsupport/fontdatabases
Change-Id: I9d69b97ca25ee52ab627cfa633f43b277acc5e05
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 3f9eddbcbf..f731b9443a 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -102,11 +102,9 @@ contains(QT_CONFIG, freetype) { QT_FREETYPE_DIR = $$QT_SOURCE_TREE/src/3rdparty/freetype HEADERS += \ - qwindowsfontdatabase_ft.h \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h + qwindowsfontdatabase_ft.h SOURCES += \ qwindowsfontdatabase_ft.cpp \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp \ $$QT_FREETYPE_DIR/src/base/ftbase.c \ $$QT_FREETYPE_DIR/src/base/ftbbox.c \ $$QT_FREETYPE_DIR/src/base/ftdebug.c \ |