diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-23 17:01:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-23 17:01:50 (GMT) |
| commit | e3999a4f91194b7508dbd1d3e6f595f729022ed7 (patch) | |
| tree | 23a15e76da447177f2114694a2170defc554e010 /src/gui | |
| parent | 33d028497a8276664e9c717895313c0ee56f6929 (diff) | |
| parent | e22225323804de65894c7beace833cc77606f8d5 (diff) | |
| download | Qt-e3999a4f91194b7508dbd1d3e6f595f729022ed7.zip Qt-e3999a4f91194b7508dbd1d3e6f595f729022ed7.tar.gz Qt-e3999a4f91194b7508dbd1d3e6f595f729022ed7.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:
Fixed usage of xplatform in configure.
Fixed mif generation on symbian-abld.
Fixed regular expression matching.
More fool proof way for finding these headers
Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c
Enable installation of a sis file without running any application
Replace download % display with a progress bar
This file does not exist
Fix configure false positives when checking for symbian
Fix compile on symbian better.
Make ICON generation (to symbian mif) work for relative paths/shadow builds
Disable OpenVG for symbian-sbsv2 on Linux.
Corrected wrong header casing.
Moved -s60 and -usedeffiles options docs to Symbian section.
Added rpp and rsg files to ignore filter.
Forced little endianness when using symbian-sbsv2 mkspec.
Fixed incorrect platform string when building for Symbian.
Added -qt-style-s60 to Symbian configure options on Linux.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 6138e85..4a279a7 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -63,7 +63,7 @@ #include <AknUtils.h> #include <aknnavi.h> #include <gulicon.h> -#include <AknBitmapAnimation.h> +#include <aknbitmapanimation.h> #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN) |