diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-10-29 04:10:11 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-10-29 06:06:15 (GMT) |
| commit | 5ad00389fd411992b042c07990dd681018f58c36 (patch) | |
| tree | 7f01db8ec7358036b13cb4f8fe92018f2c045fd5 | |
| parent | 3e6349e6b23d1ac5a8991370f0866ebd95556111 (diff) | |
| download | Qt-5ad00389fd411992b042c07990dd681018f58c36.zip Qt-5ad00389fd411992b042c07990dd681018f58c36.tar.gz Qt-5ad00389fd411992b042c07990dd681018f58c36.tar.bz2 | |
Remove unnecessary QML import project dependency to Symbian deployment pri file used by Qt demos
Task-number: QT-4197
Reviewed-by: Jason Barron
* breaks compilation of releases that omit Qt demos directory
* qt import plugins have different deployment configuration than demo applications
* declarative import plugins already get their symbian-related settings from src\imports\qimportbase.pri
that is basically a copy from qpluginbase.pri written for plugins
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 1 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 1 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index b2e5360..8964ab0 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -15,7 +15,6 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ TARGET.UID3 = 0x20021320 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) isEmpty(DESTDIR):importFiles.sources = qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir else:importFiles.sources = $$DESTDIR/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 18ffcb9..a4c914d 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -15,7 +15,6 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ TARGET.UID3 = 0x2002131F - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) isEmpty(DESTDIR):importFiles.sources = qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir else:importFiles.sources = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index a3eb0d1..bb9da01 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -19,7 +19,6 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ TARGET.UID3 = 0x2002131E - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) isEmpty(DESTDIR):importFiles.sources = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir else:importFiles.sources = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir |