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/s60main | |
| 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/s60main')
| -rw-r--r-- | src/s60main/s60main.rsg | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/s60main/s60main.rsg b/src/s60main/s60main.rsg deleted file mode 100644 index 8cdf3ba..0000000 --- a/src/s60main/s60main.rsg +++ /dev/null @@ -1,3 +0,0 @@ -#define R_DEFAULT_DOCUMENT_NAME 0x55567002 -#define R_QT_WRAPPERAPP_MENUBAR 0x55567004 -#define R_QT_WRAPPERAPP_MENU 0x55567005 |