diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
| commit | e4002434bfde5c8206463ea3a0d4140835619944 (patch) | |
| tree | f199a1e233867ab4e85d22aa138391585af75fca /src/qbase.pri | |
| parent | 3f183debfd677b952b015f6950131dd25bd4768b (diff) | |
| parent | 5a7c14af3c27089b0b8698da3c689637ffaa9cfa (diff) | |
| download | Qt-e4002434bfde5c8206463ea3a0d4140835619944.zip Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.gz Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/qbase.pri')
| -rw-r--r-- | src/qbase.pri | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 137b933..27e4992 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -90,9 +90,19 @@ win32 { !static: DEFINES+=QT_MAKEDLL } symbian { - !static { + shared { DEFINES+=QT_MAKEDLL - TARGET.CAPABILITY = All -Tcb + TARGET.CAPABILITY = All -Tcb + + defBlock = \ + "$${LITERAL_HASH}ifdef WINSCW" \ + "DEFFILE ../s60installs/bwins/$${TARGET}.def" \ + "$${LITERAL_HASH}elif defined EABI" \ + "DEFFILE ../s60installs/eabi/$${TARGET}.def" \ + "$${LITERAL_HASH}endif" + + #MMP_RULES += defBlock + MMP_RULES += EXPORTUNFROZEN } load(armcc_warnings) } |