diff options
| author | axis <qt-info@nokia.com> | 2010-08-03 07:37:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-08-03 07:37:15 (GMT) |
| commit | 1f816c18df27cf3b39f94759ceccdaa3514e4e8d (patch) | |
| tree | 14698bf9187d3182706e058d067129044c148315 /src/gui | |
| parent | 6b2a5c6f18cb766801a50db583e14a8e559e9bfb (diff) | |
| parent | 63d56a0815fead98b4bedc5b039458eea455495e (diff) | |
| download | Qt-1f816c18df27cf3b39f94759ceccdaa3514e4e8d.zip Qt-1f816c18df27cf3b39f94759ceccdaa3514e4e8d.tar.gz Qt-1f816c18df27cf3b39f94759ceccdaa3514e4e8d.tar.bz2 | |
Merge branch 'symbian3Patches' into 4.7-s60
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/inputmethod/qinputcontextfactory.cpp | 2 | ||||
| -rw-r--r-- | src/gui/s60framework/qs60maindocument.h | 2 | ||||
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/gui/inputmethod/qinputcontextfactory.cpp index ec8d8e2..865c1b2 100644 --- a/src/gui/inputmethod/qinputcontextfactory.cpp +++ b/src/gui/inputmethod/qinputcontextfactory.cpp @@ -73,7 +73,7 @@ #endif #ifdef Q_WS_S60 #include "qcoefepinputcontext_p.h" -#include "akninputlanguageinfo.h" +#include "AknInputLanguageInfo.h" #endif #include "private/qfactoryloader_p.h" diff --git a/src/gui/s60framework/qs60maindocument.h b/src/gui/s60framework/qs60maindocument.h index 2f0564f..fc32d8b 100644 --- a/src/gui/s60framework/qs60maindocument.h +++ b/src/gui/s60framework/qs60maindocument.h @@ -47,7 +47,7 @@ #ifdef Q_OS_SYMBIAN #ifdef Q_WS_S60 -#include <akndoc.h> +#include <AknDoc.h> typedef CAknDocument QS60MainDocumentBase; #else #include <eikdoc.h> diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 2527662..f44b85e 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -58,12 +58,12 @@ #include <AknsSkinInstance.h> #include <AknsBasicBackgroundControlContext.h> #include <avkon.mbg> -#include <aknfontaccess.h> -#include <aknlayoutfont.h> +#include <AknFontAccess.h> +#include <AknLayoutFont.h> #include <AknUtils.h> #include <aknnavi.h> #include <gulicon.h> -#include <aknbitmapanimation.h> +#include <AknBitmapAnimation.h> #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN) |