diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 16:45:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-10 16:45:58 (GMT) |
| commit | edd1dc8caedf099422b5efeed48b7feea0927681 (patch) | |
| tree | 2414f6c0f1a7462ee8115a738fc414c51a0abd15 /src/gui/text/qfontengine_s60.cpp | |
| parent | 9c8f678ef95ed3eb6eae09a72695a27728a0e1c6 (diff) | |
| parent | 709a3a4b96f4cc483e63958494adbc5efdf6c57d (diff) | |
| download | Qt-edd1dc8caedf099422b5efeed48b7feea0927681.zip Qt-edd1dc8caedf099422b5efeed48b7feea0927681.tar.gz Qt-edd1dc8caedf099422b5efeed48b7feea0927681.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
License update as requested by legal for file relicensed from S60.
Make compile
Removed dependency to moc.exe from Symbian builds
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp index 9dd4af7..3ea084b 100644 --- a/src/gui/text/qfontengine_s60.cpp +++ b/src/gui/text/qfontengine_s60.cpp @@ -44,7 +44,7 @@ #include "qglobal.h" #include <private/qapplication_p.h> #include "qimage.h" -#include "qt_s60_p.h" +#include <private/qt_s60_p.h> #include <e32base.h> #include <e32std.h> |