diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 16:06:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 16:06:30 (GMT) |
| commit | 4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11 (patch) | |
| tree | f19b0091967ea0211f45ffe23838fff40dbc9ea6 /src/imports | |
| parent | 967afc717ffd411e22ce94de77cf54284815b27e (diff) | |
| parent | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (diff) | |
| download | Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.zip Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.tar.gz Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/imports')
| -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 ef58226..44764a9 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.files = qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir else:importFiles.files = $$DESTDIR/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index 5722b68..ad872ba 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.files = qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir else:importFiles.files = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index fd6f0f6..90b50e4 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.files = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir else:importFiles.files = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir |