diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-09 20:59:14 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:25:55 (GMT) |
| commit | 7bbb5a34ee39d60d4c72df5ed8bd3ac13b5dc554 (patch) | |
| tree | 6015e8d2abc3d34dc6b4ff66181a020ae1cd1d2d /src/gui/text | |
| parent | b738f0d36ed7101962bc387ca1cb34db052faf60 (diff) | |
| download | Qt-7bbb5a34ee39d60d4c72df5ed8bd3ac13b5dc554.zip Qt-7bbb5a34ee39d60d4c72df5ed8bd3ac13b5dc554.tar.gz Qt-7bbb5a34ee39d60d4c72df5ed8bd3ac13b5dc554.tar.bz2 | |
Various header file inclusion fixes for rvct on linux using a case-sensitive file system.
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfont_s60.cpp | 4 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 6 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 1285935..7b630da 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -73,7 +73,7 @@ #endif #endif #ifdef Q_OS_SYMBIAN -#include "qt_s60_p.h" +#include <private/qt_s60_p.h> #endif #include <QMutexLocker> diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp index 277d88f..3439028 100644 --- a/src/gui/text/qfont_s60.cpp +++ b/src/gui/text/qfont_s60.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qfont.h" -#include "qt_s60_p.h" -#include "qpixmap_s60_p.h" +#include <private/qt_s60_p.h> +#include <private/qpixmap_s60_p.h> #include "qmutex.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index 1a6bb11..84c631c 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -45,12 +45,12 @@ #include "qfontengine_s60_p.h" #include "qabstractfileengine.h" #include "qdesktopservices.h" -#include "qpixmap_s60_p.h" -#include "qt_s60_p.h" +#include <private/qpixmap_s60_p.h> +#include <private/qt_s60_p.h> #include "qendian.h" #include <private/qcore_symbian_p.h> #if defined(QT_NO_FREETYPE) -#include <OPENFONT.H> +#include <openfont.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index 44f8122..746f929 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; |