diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-16 06:33:51 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-18 03:02:23 (GMT) |
| commit | ded9ddeb937b9525a55e980c4a22a2e0ef43d82f (patch) | |
| tree | d37333ef1876c374dbec086d00743255b5e500cd | |
| parent | dbbd5c45a199885b4f96146f06973d6c7c2f65f4 (diff) | |
| download | Qt-ded9ddeb937b9525a55e980c4a22a2e0ef43d82f.zip Qt-ded9ddeb937b9525a55e980c4a22a2e0ef43d82f.tar.gz Qt-ded9ddeb937b9525a55e980c4a22a2e0ef43d82f.tar.bz2 | |
Install Qt declarative (if available) and QmlPatterns on S60
Reviewed-by: Warwick Allison
(cherry picked from commit cc6befac3780a34eefb4e02e2a4fd6266d454242)
| -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 } |