diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 20:57:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 20:57:04 (GMT) |
| commit | 0274069a9f6f011a97baf283d556b1fec388b672 (patch) | |
| tree | 7d958812ec0c3547d2c0bc867ebc6379463fae9e /src/s60installs/s60installs.pro | |
| parent | 2648d5a2dc6ad4dee9ac685330b000a34339a758 (diff) | |
| parent | 9b7c1eb6fbfab71cfd3ebe8cb5ded98141ae2304 (diff) | |
| download | Qt-0274069a9f6f011a97baf283d556b1fec388b672.zip Qt-0274069a9f6f011a97baf283d556b1fec388b672.tar.gz Qt-0274069a9f6f011a97baf283d556b1fec388b672.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
DEF file updates for BWINS and EABI for Symbian
Fix typo
Revert "Add QML imports to s60installs.pro"
Assigned a UID3 to qml.exe.
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d899b3e..ad196a8 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -143,25 +143,6 @@ symbian: { contains(QT_CONFIG, declarative): { qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtDeclarative$${QT_LIBINFIX}.dll - - widgetImport.sources = widgets.dll $$QT_BUILD_TREE/src/imports/widgets/qmldir - widgetImport.path = $$QT_IMPORTS_BASE_DIR/Qt/widgets - DEPLOYMENT += widgetImport - - particlesImport.sources = particles.dll $$QT_BUILD_TREE/src/imports/particles/qmldir - particlesImport.path = $$QT_IMPORTS_BASE_DIR/Qt/labs/particles - DEPLOYMENT += particlesImport - - contains(QT_CONFIG, webkit): { - webkitImport.sources = webkitqmlplugin.dll $$QT_BUILD_TREE/src/imports/webkit/qmldir - webkitImport.path = $$QT_IMPORTS_BASE_DIR/org/webkit - DEPLOYMENT += webkitImport - } - contains(QT_CONFIG, multimedia): { - multimediaImport.sources = multimedia.dll $$QT_BUILD_TREE/src/imports/multimedia/qmldir - multimediaImport.path = $$QT_IMPORTS_BASE_DIR/Qt/multimedia - DEPLOYMENT += multimediaImport - } } graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems |