diff options
| author | Ian Dean <ian@mediator-software.com> | 2012-07-18 20:50:06 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-25 07:08:35 (GMT) |
| commit | d91b88ba9f00d3321eedc19a6b49120a9b99dec9 (patch) | |
| tree | 14c6bfbf9b65489b32b7b171ebc5bc01f79d4440 | |
| parent | ef4af1217af456dbddc3b5df4004378019a85404 (diff) | |
| download | Qt-d91b88ba9f00d3321eedc19a6b49120a9b99dec9.zip Qt-d91b88ba9f00d3321eedc19a6b49120a9b99dec9.tar.gz Qt-d91b88ba9f00d3321eedc19a6b49120a9b99dec9.tar.bz2 | |
Moved CoreText (iOS) font database to shared font database plugin folder.
Change-Id: I780e5b12159c078356334f5225f878ec525a8a64
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -rw-r--r-- | src/plugins/platforms/fontdatabases/coretext/coretext.pri | 10 | ||||
| -rw-r--r-- | src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.h (renamed from src/plugins/platforms/uikit/qcoretextfontdatabase.h) | 0 | ||||
| -rw-r--r-- | src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.mm (renamed from src/plugins/platforms/uikit/qcoretextfontdatabase.mm) | 0 | ||||
| -rw-r--r-- | src/plugins/platforms/uikit/platform.pro | 14 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/plugins/platforms/fontdatabases/coretext/coretext.pri b/src/plugins/platforms/fontdatabases/coretext/coretext.pri new file mode 100644 index 0000000..3ff2024 --- /dev/null +++ b/src/plugins/platforms/fontdatabases/coretext/coretext.pri @@ -0,0 +1,10 @@ +OBJECTIVE_HEADERS += \ + $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.h + +OBJECTIVE_SOURCES += \ + $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.mm + +INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src \ + $$QT_SOURCE_TREE/src/plugins/platforms/fontdatabases/coretext + + diff --git a/src/plugins/platforms/uikit/qcoretextfontdatabase.h b/src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.h index 77010c2..77010c2 100644 --- a/src/plugins/platforms/uikit/qcoretextfontdatabase.h +++ b/src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.h diff --git a/src/plugins/platforms/uikit/qcoretextfontdatabase.mm b/src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.mm index 47bfba1..47bfba1 100644 --- a/src/plugins/platforms/uikit/qcoretextfontdatabase.mm +++ b/src/plugins/platforms/fontdatabases/coretext/qcoretextfontdatabase.mm diff --git a/src/plugins/platforms/uikit/platform.pro b/src/plugins/platforms/uikit/platform.pro index 1b90f3e..4e6a99a 100644 --- a/src/plugins/platforms/uikit/platform.pro +++ b/src/plugins/platforms/uikit/platform.pro @@ -9,8 +9,7 @@ OBJECTIVE_SOURCES = main.mm \ quikitwindow.mm \ quikitscreen.mm \ quikiteventloop.mm \ - quikitwindowsurface.mm \ - qcoretextfontdatabase.mm + quikitwindowsurface.mm OBJECTIVE_HEADERS = quikitintegration.h \ quikitwindow.h \ @@ -18,16 +17,9 @@ OBJECTIVE_HEADERS = quikitintegration.h \ quikiteventloop.h \ quikitwindowsurface.h -HEADERS = quikitsoftwareinputhandler.h \ - qcoretextfontdatabase.h +HEADERS = quikitsoftwareinputhandler.h -#needed for qcoretextfontengine even if it's not used -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -#add libz for freetype. -LIBS += -lz +include(../fontdatabases/coretext/coretext.pri) target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target - - |