diff options
| author | axis <qt-info@nokia.com> | 2010-01-05 15:07:30 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-05 15:07:30 (GMT) |
| commit | 0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (patch) | |
| tree | 04308596166ab753de6de705fcd80b091e4562ad /src/gui/text | |
| parent | 6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff) | |
| parent | 78474a65e4f61e9d1ae8116d5b690cf78729aa71 (diff) | |
| download | Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.zip Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.gz Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.bz2 | |
Merge branch 'merge-request-1601' into master-s60
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index bf8af92..0118f9b 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.cpp b/src/gui/text/qfontengine_s60.cpp index e279ad2..e9883a7 100644 --- a/src/gui/text/qfontengine_s60.cpp +++ b/src/gui/text/qfontengine_s60.cpp @@ -49,8 +49,8 @@ #include <e32base.h> #include <e32std.h> -#include <EIKENV.H> -#include <GDI.H> +#include <eikenv.h> +#include <gdi.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index 9e22245..460b5ee 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; |