diff options
| author | axis <qt-info@nokia.com> | 2010-01-05 15:07:30 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-05 15:07:30 (GMT) |
| commit | 0d92fc13baac9d354a7d3a2665ca3bb4127bd606 (patch) | |
| tree | 04308596166ab753de6de705fcd80b091e4562ad /src/gui/kernel | |
| parent | 6abee18b8ab9899b909a15227fba8fbc4506fad8 (diff) | |
| parent | 78474a65e4f61e9d1ae8116d5b690cf78729aa71 (diff) | |
| download | Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.zip Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.gz Qt-0d92fc13baac9d354a7d3a2665ca3bb4127bd606.tar.bz2 | |
Merge branch 'merge-request-1601' into master-s60
Conflicts:
bin/createpackage.pl
mkspecs/features/symbian/application_icon.prf
qmake/generators/symbian/symmake_abld.cpp
src/gui/text/qfontdatabase_s60.cpp
src/s60main/s60main.pro
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qdnd_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qsound_s60.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 27f2644..50df36e 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -63,7 +63,7 @@ #include "private/qsoftkeymanager_p.h" #include "apgwgnam.h" // For CApaWindowGroupName -#include <MdaAudioTonePlayer.h> // For CMdaAudioToneUtility +#include <mdaaudiotoneplayer.h> // For CMdaAudioToneUtility #if defined(Q_WS_S60) # if !defined(QT_NO_IM) diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/kernel/qdnd_s60.cpp index 65deb5d..319c844 100644 --- a/src/gui/kernel/qdnd_s60.cpp +++ b/src/gui/kernel/qdnd_s60.cpp @@ -52,7 +52,7 @@ #include "qdnd_p.h" #include "qt_s60_p.h" -#include <COECNTRL.H> +#include <coecntrl.h> // pointer cursor #include <w32std.h> #include <gdi.h> diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/kernel/qsound_s60.cpp index af0fae6..cbbf838 100644 --- a/src/gui/kernel/qsound_s60.cpp +++ b/src/gui/kernel/qsound_s60.cpp @@ -51,7 +51,7 @@ #include <private/qcore_symbian_p.h> #include <e32std.h> -#include <MdaAudioSamplePlayer.h> +#include <mdaaudiosampleplayer.h> QT_BEGIN_NAMESPACE |