summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-11-16 06:33:51 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-11-16 06:33:51 (GMT)
commitcc6befac3780a34eefb4e02e2a4fd6266d454242 (patch)
treee67f47837e41d63bbf7c734af9acf7f91788da01 /src
parent626d9bc89fdade0e91d66d66c858a2b86c98f7ea (diff)
downloadQt-cc6befac3780a34eefb4e02e2a4fd6266d454242.zip
Qt-cc6befac3780a34eefb4e02e2a4fd6266d454242.tar.gz
Qt-cc6befac3780a34eefb4e02e2a4fd6266d454242.tar.bz2
Install Qt declarative (if available) and QmlPatterns on S60
Reviewed-by: Warwick Allison
Diffstat (limited to 'src')
-rw-r--r--src/s60installs/qt.iby2
-rw-r--r--src/s60installs/s60installs.pro4
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
}