diff options
| author | axis <qt-info@nokia.com> | 2010-06-04 10:07:18 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-06-04 10:07:18 (GMT) |
| commit | 0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9 (patch) | |
| tree | 239d99db858b89662ba8544787c8172116043c34 /src/plugins | |
| parent | 58c591974bf34577e27638f1328a04c4f7c698f8 (diff) | |
| parent | cb59e56bc9f34c50dc4a2d01d2ea506c5d735225 (diff) | |
| download | Qt-0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9.zip Qt-0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9.tar.gz Qt-0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9.tar.bz2 | |
Merge branch 'def_files_and_plugins' into 4.7-s60
Diffstat (limited to 'src/plugins')
| -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 |