diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 23:13:24 (GMT) |
| commit | 840dab97ee4bd68dcf75cfd2edd5e58c38040ae1 (patch) | |
| tree | 04270ec3cad3bfb3d2cb48f6c6455b49aee02b53 /src/gui/kernel/qapplication.cpp | |
| parent | 46e84339a9eaf1587528c20a4c9e05bc1b549afd (diff) | |
| parent | 01498eb9a44f3b15e517e81b309087fbbf1b93bf (diff) | |
| download | Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.zip Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.gz Qt-840dab97ee4bd68dcf75cfd2edd5e58c38040ae1.tar.bz2 | |
Merge remote branch 'origin/master' into mobility-master
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 336be91..4ec2ae2 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -122,15 +122,19 @@ extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp static void initResources() { #if defined(Q_WS_WINCE) + Q_INIT_RESOURCE_EXTERN(qstyle_wince) Q_INIT_RESOURCE(qstyle_wince); #elif defined(Q_OS_SYMBIAN) + Q_INIT_RESOURCE_EXTERN(qstyle_s60) Q_INIT_RESOURCE(qstyle_s60); #else + Q_INIT_RESOURCE_EXTERN(qstyle) Q_INIT_RESOURCE(qstyle); #endif - + Q_INIT_RESOURCE_EXTERN(qmessagebox) Q_INIT_RESOURCE(qmessagebox); #if !defined(QT_NO_PRINTDIALOG) + Q_INIT_RESOURCE_EXTERN(qprintdialog) Q_INIT_RESOURCE(qprintdialog); #endif |