diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 17:39:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 17:39:11 (GMT) |
| commit | 90f885a7fea4afb719629967567353db84085ea0 (patch) | |
| tree | fcc691ed05c010a336e71948e02fcc2c2c60d429 /src | |
| parent | 969750777896dc50f9f5b8043b5da3a4a161e616 (diff) | |
| parent | d58d673c48c1f158fa7d6a59a57671b4305454be (diff) | |
| download | Qt-90f885a7fea4afb719629967567353db84085ea0.zip Qt-90f885a7fea4afb719629967567353db84085ea0.tar.gz Qt-90f885a7fea4afb719629967567353db84085ea0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update webview visual tests to new skip mode
Remove unnecessary QML import project dependency to Symbian deployment pri file used by Qt demos
Update visual tests for Mac
Revert "Disable WebView visualtests"
Mark dynamic.qml as expect-fail the new way
Update gridview visual tests
Revert "Mark qdeclarativegridview autotests as expect-fail"
Diffstat (limited to 'src')
| -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 |