diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-01-29 01:53:32 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-01-29 01:53:32 (GMT) |
| commit | 91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d (patch) | |
| tree | ef09bd890041b3c44f7be3322321c96174e94054 /src/gui/kernel/qapplication.cpp | |
| parent | 687d50f05a1a2d9355f0990e845967930c57b985 (diff) | |
| parent | fe129a59ab54e6c0194c546a02bc64e886c252d5 (diff) | |
| download | Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.zip Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.gz Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 12fe797..4fe3900 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -121,8 +121,10 @@ extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp static void initResources() { -#ifdef Q_WS_WINCE +#if defined(Q_WS_WINCE) Q_INIT_RESOURCE(qstyle_wince); +#elif defined(Q_OS_SYMBIAN) + Q_INIT_RESOURCE(qstyle_s60); #else Q_INIT_RESOURCE(qstyle); #endif |