diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 07:30:01 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-30 07:30:01 (GMT) |
| commit | c2bee860f72898c6d57ff9f117256059b3952479 (patch) | |
| tree | 8f190bac91f9cbd11e6e52479a3effea132a3a20 /demos | |
| parent | de306893b464ed0fa00f98488912fd6269713519 (diff) | |
| parent | c4f59859a589b76419e9133110eda850223f03dd (diff) | |
| download | Qt-c2bee860f72898c6d57ff9f117256059b3952479.zip Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.gz Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-4.7-from-4.6
Conflicts:
mkspecs/common/symbian/symbian.conf
src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/minehunt/minehunt.pro | 15 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/photoviewer/photoviewer.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/twitter/twitter.qml | 2 |
5 files changed, 19 insertions, 4 deletions
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 2df33e6..03059c7 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -23,3 +23,18 @@ MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCo INSTALLS = sources MinehuntCore_sources target +symbian:{ + load(data_caging_paths) + TARGET.EPOCALLOWDLLDATA = 1 + TARGET.CAPABILITY = CAP_GENERAL_DLL + include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + + importFiles.sources = minehunt.dll \ + MinehuntCore/Explosion.qml \ + MinehuntCore/pics \ + MinehuntCore/qmldir + importFiles.path = $$QT_IMPORTS_BASE_DIR/MinehuntCore + DEPLOYMENT = importFiles +} + +INSTALLS = sources MinehuntCore_sources target diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml index 9e99706..2ca6c4c 100644 --- a/demos/declarative/minehunt/minehunt.qml +++ b/demos/declarative/minehunt/minehunt.qml @@ -1,5 +1,5 @@ import Qt 4.6 -import MinehuntCore 1.0 +import "MinehuntCore" 1.0 Item { id: field diff --git a/demos/declarative/photoviewer/photoviewer.qml b/demos/declarative/photoviewer/photoviewer.qml index 8feee02..662ea12 100644 --- a/demos/declarative/photoviewer/photoviewer.qml +++ b/demos/declarative/photoviewer/photoviewer.qml @@ -1,5 +1,5 @@ import Qt 4.6 -import PhotoViewerCore 1.0 +import "PhotoViewerCore" 1.0 Rectangle { id: mainWindow diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index f084ff6..6c58d49 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -1,5 +1,5 @@ import Qt 4.6 -import SamegameCore 1.0 +import "SamegameCore" 1.0 import "SamegameCore/samegame.js" as Logic Rectangle { diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml index 259f79a..94d53f1 100644 --- a/demos/declarative/twitter/twitter.qml +++ b/demos/declarative/twitter/twitter.qml @@ -1,5 +1,5 @@ import Qt 4.6 -import TwitterCore 1.0 as Twitter +import "TwitterCore" 1.0 as Twitter Item { id: screen; width: 320; height: 480 |