diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 02:30:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 02:30:50 (GMT) |
| commit | 4c9e2a4376a52891a21f75e2a441848234ed93c2 (patch) | |
| tree | 5eb3ea85a2c7194639aad9b921a03f4aa4930fe9 /src/gui/s60framework/qs60mainapplication.cpp | |
| parent | 8b8a4e960be30d64d2bc093662ddb1cefeae524e (diff) | |
| parent | 7f875312dcc09a4b2dcc5030e813e921b1dc7ee4 (diff) | |
| download | Qt-4c9e2a4376a52891a21f75e2a441848234ed93c2.zip Qt-4c9e2a4376a52891a21f75e2a441848234ed93c2.tar.gz Qt-4c9e2a4376a52891a21f75e2a441848234ed93c2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix crash when using Q_GLOBAL_STATIC(QWidget...)
Removed the need for S60main.rsc resource file in Symbian.
Diffstat (limited to 'src/gui/s60framework/qs60mainapplication.cpp')
| -rw-r--r-- | src/gui/s60framework/qs60mainapplication.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 5d4c54e..74432af 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -58,7 +58,6 @@ CApaApplication *newS60Application() return new QS60MainApplication; } -_LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main" QT_LIBINFIX_UNICODE L".rsc"); /*! \class QS60MainApplication @@ -129,10 +128,6 @@ TUid QS60MainApplication::AppDllUid() const */ TFileName QS60MainApplication::ResourceFileName() const { - TFindFile finder(iCoeEnv->FsSession()); - TInt err = finder.FindByDir(KQtWrapperResourceFile, KNullDesC); - if (err == KErrNone) - return finder.File(); return KNullDesC(); } |