diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 01:08:17 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 01:08:17 (GMT) |
| commit | e7566980e349f163cd45e84406f69f3a5a1a1649 (patch) | |
| tree | 9b16c29305f70df85cee16383649618cfc8ec84b /src/gui/text | |
| parent | 8e65adce9ced8f3b1d42b938e4d65e1af4768c33 (diff) | |
| parent | a4de5dc69634b90b2fc6c8bd65d936fe80a5afd9 (diff) | |
| download | Qt-e7566980e349f163cd45e84406f69f3a5a1a1649.zip Qt-e7566980e349f163cd45e84406f69f3a5a1a1649.tar.gz Qt-e7566980e349f163cd45e84406f69f3a5a1a1649.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed the host detection in qmake profiles.
Improving parts of commit 2d8d855d.
qmake: add Linux host support to Symbian generator
Fixed indentation.
Add Linux host support to Symbian mkspecs.
Linux support for platform specific commands in .pro files.
Add createpackage.bat equivalent for Unix systems.
Make all Symbian #includes lower case.
mkspecs: fix warning when calling qmake
Fix portability problems in bin/createpackage.pl.
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index f8de08f..3ae6fe9 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -50,7 +50,7 @@ #include "qendian.h" #include <private/qcore_symbian_p.h> #if defined(QT_NO_FREETYPE) -#include <OPENFONT.H> +#include <openfont.h> #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include <graphics/openfontrasterizer.h> // COpenFontRasterizer has moved to a new header file #endif // SYMBIAN_ENABLE_SPLIT_HEADERS diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index ff819e2..6d47b9d 100644 --- a/src/gui/text/qfontengine_s60_p.h +++ b/src/gui/text/qfontengine_s60_p.h @@ -56,7 +56,7 @@ #include "qconfig.h" #include "qfontengine_p.h" #include "qsize.h" -#include <OPENFONT.H> +#include <openfont.h> class CFbsBitmap; class CFbsBitmapDevice; |