diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-16 08:44:07 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-16 08:45:10 (GMT) |
| commit | f26fe1cb7bbbdfd3e623a67612dcb30716b257e8 (patch) | |
| tree | b347b20c89c543a602df4feaa4eab04871641f9d /src | |
| parent | e3b0faf03a2db5b0e38d97ceda09024ec8daf458 (diff) | |
| parent | aa482dcbde0089fe32ca59e39f17e5e44fd8b244 (diff) | |
| download | Qt-f26fe1cb7bbbdfd3e623a67612dcb30716b257e8.zip Qt-f26fe1cb7bbbdfd3e623a67612dcb30716b257e8.tar.gz Qt-f26fe1cb7bbbdfd3e623a67612dcb30716b257e8.tar.bz2 | |
Merge branch 'upstream/4.6' into oslo-staging-2/4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/s60installs/qt.iby | 2 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index bc69dce..41eb562 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -57,6 +57,8 @@ file=ABI_DIR\BUILD_DIR\QtTest.dll SHARED_LIB_DIR\QtTest.dll PAG file=ABI_DIR\BUILD_DIR\QtWebKit.dll SHARED_LIB_DIR\QtWebKit.dll PAGED file=ABI_DIR\BUILD_DIR\phonon.dll SHARED_LIB_DIR\phonon.dll PAGED file=ABI_DIR\BUILD_DIR\QtMultimedia.dll SHARED_LIB_DIR\QtMultimedia.dll PAGED +file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll SHARED_LIB_DIR\QtXmlPatterns.dll PAGED +file=ABI_DIR\BUILD_DIR\QtDeclarative.dll SHARED_LIB_DIR\QtDeclarative.dll PAGED // imageformats file=ABI_DIR\BUILD_DIR\qgif.dll SHARED_LIB_DIR\qgif.dll PAGED diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 90c9f27..2d9c489 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -101,6 +101,10 @@ symbian: { qtlibraries.sources += QtXmlPatterns.dll } + contains(QT_CONFIG, declarative): { + qtlibraries.sources += QtDeclarative.dll + } + contains(QT_CONFIG, webkit): { qtlibraries.sources += QtWebKit.dll } |