diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 11:17:26 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-28 11:17:26 (GMT) |
commit | 4bb139749a1c830ced5211eb8159ccb52a87acc1 (patch) | |
tree | 2e4fbeb6bb392393ba35258d796abba0c4f12780 | |
parent | 344b4ab658a03d81bbdb7bb5f74b2b5c8bd517e8 (diff) | |
parent | 0db888489e613ca5c5c57c46e1043e1823fcd0d8 (diff) | |
download | Qt-4bb139749a1c830ced5211eb8159ccb52a87acc1.zip Qt-4bb139749a1c830ced5211eb8159ccb52a87acc1.tar.gz Qt-4bb139749a1c830ced5211eb8159ccb52a87acc1.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix openvg compilation on win32.
-rw-r--r-- | src/openvg/qvgfontglyphcache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvg/qvgfontglyphcache_p.h b/src/openvg/qvgfontglyphcache_p.h index 9a105ec..ce12301 100644 --- a/src/openvg/qvgfontglyphcache_p.h +++ b/src/openvg/qvgfontglyphcache_p.h @@ -56,7 +56,7 @@ #include <QtCore/qvarlengtharray.h> #include <QtGui/private/qfontengine_p.h> -#include <qvg_p.h> +#include "qvg_p.h" QT_BEGIN_NAMESPACE |