diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-07 15:58:06 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-07 15:58:06 (GMT) |
| commit | 06ef7df062507f301fe7e07852a31087ff028f5b (patch) | |
| tree | bbefbae2ad27cea63c7fbfd5f8d6c3d61c41fb00 /src/plugins/s60/s60pluginbase.pri | |
| parent | 1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (diff) | |
| parent | bf966d125d5c5fa7719ae9f9110db8742d5a4c85 (diff) | |
| download | Qt-06ef7df062507f301fe7e07852a31087ff028f5b.zip Qt-06ef7df062507f301fe7e07852a31087ff028f5b.tar.gz Qt-06ef7df062507f301fe7e07852a31087ff028f5b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/s60/s60pluginbase.pri')
| -rw-r--r-- | src/plugins/s60/s60pluginbase.pri | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri index 1a6f4a2..4e15102 100644 --- a/src/plugins/s60/s60pluginbase.pri +++ b/src/plugins/s60/s60pluginbase.pri @@ -8,11 +8,16 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60 MMP_RULES += NOEXPORTLIBRARY -defBlock = \ - "$${LITERAL_HASH}ifdef WINSCW" \ - "DEFFILE ../bwins/qts60plugin.def" \ - "$${LITERAL_HASH}else" \ - "DEFFILE ../eabi/qts60plugin.def" \ - "$${LITERAL_HASH}endif" +symbian-abld|symbian-sbsv2 { + defBlock = \ + "$${LITERAL_HASH}ifdef WINSCW" \ + "DEFFILE ../bwins/qts60plugin.def" \ + "$${LITERAL_HASH}else" \ + "DEFFILE ../eabi/qts60plugin.def" \ + "$${LITERAL_HASH}endif" +} else { + CONFIG *= def_files + DEF_FILE = ../eabi/qts60pluginu.def +} MMP_RULES += defBlock
\ No newline at end of file |