diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 20:57:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 20:57:04 (GMT) |
| commit | 0274069a9f6f011a97baf283d556b1fec388b672 (patch) | |
| tree | 7d958812ec0c3547d2c0bc867ebc6379463fae9e /tools | |
| parent | 2648d5a2dc6ad4dee9ac685330b000a34339a758 (diff) | |
| parent | 9b7c1eb6fbfab71cfd3ebe8cb5ded98141ae2304 (diff) | |
| download | Qt-0274069a9f6f011a97baf283d556b1fec388b672.zip Qt-0274069a9f6f011a97baf283d556b1fec388b672.tar.gz Qt-0274069a9f6f011a97baf283d556b1fec388b672.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:
DEF file updates for BWINS and EABI for Symbian
Fix typo
Revert "Add QML imports to s60installs.pro"
Assigned a UID3 to qml.exe.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/qml.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 869907f..7a101d0 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -26,7 +26,7 @@ QT += scripttools \ } } symbian { -# TARGET.UID3 = + TARGET.UID3 = 0x20021317 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 |