diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 13:46:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-12 13:46:14 (GMT) |
| commit | da71781844f85d5f66ca676a21fa2c0896e35e06 (patch) | |
| tree | 9486fda1d88db9443192aea45304be107bc9061b /src/gui/kernel/qt_s60_p.h | |
| parent | 76c0bc4f95fce3c5fd9f77b778180d1b50b2b095 (diff) | |
| parent | f87f8078cdda79aad81cbd3fab3c5077bef3e2f6 (diff) | |
| download | Qt-da71781844f85d5f66ca676a21fa2c0896e35e06.zip Qt-da71781844f85d5f66ca676a21fa2c0896e35e06.tar.gz Qt-da71781844f85d5f66ca676a21fa2c0896e35e06.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:
Fixed filename cases to support building Qt for Symbian in Linux
Moved softkey "Options" action handling from QMainWindow to QMenuBar.
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 735ca7a..cedede1 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -68,12 +68,12 @@ #include <eikappui.h> #ifdef Q_WS_S60 -#include <aknutils.h> // AknLayoutUtils +#include <AknUtils.h> // AknLayoutUtils #include <avkon.hrh> // EEikStatusPaneUidTitle #include <akntitle.h> // CAknTitlePane #include <akncontext.h> // CAknContextPane #include <eikspane.h> // CEikStatusPane -#include <aknpopupfader.h> // MAknFadedComponent and TAknPopupFader +#include <AknPopupFader.h> // MAknFadedComponent and TAknPopupFader #endif QT_BEGIN_NAMESPACE |