diff options
author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-01-24 11:16:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 04:05:40 +0100 |
commit | 3aef11802c5f4ca0f3bde121e1704594f775bc33 (patch) | |
tree | 236d6d01bb16f8148272c3e36b145bb14bb82e31 /demos | |
parent | c6618ef6e6d1b6b7ca7b52bfcda0f1489cc79198 (diff) | |
download | qt4-tools-3aef11802c5f4ca0f3bde121e1704594f775bc33.tar.gz |
Symbian: fix qml file paths in building of demos
The location of included QML files in demos had changed at some point,
but the symbian specific QML deployment parts were not updated to
reflect the new locations, thus breaking compilation.
Change-Id: Id01a685ca1de75cf73d32170b9f404c6619da7f5
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r-- | demos/declarative/minehunt/minehunt.pro | 2 | ||||
-rw-r--r-- | demos/embedded/qmlcalculator/deployment.pri | 4 | ||||
-rw-r--r-- | demos/embedded/qmlclocks/deployment.pri | 4 | ||||
-rw-r--r-- | demos/embedded/qmldialcontrol/deployment.pri | 4 | ||||
-rw-r--r-- | demos/embedded/qmleasing/deployment.pri | 4 | ||||
-rw-r--r-- | demos/embedded/qmlflickr/deployment.pri | 5 | ||||
-rw-r--r-- | demos/embedded/qmlphotoviewer/deployment.pri | 4 | ||||
-rw-r--r-- | demos/embedded/qmltwitter/deployment.pri | 4 |
8 files changed, 22 insertions, 9 deletions
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 29af4ccb1a..5c0b7078ff 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -20,8 +20,6 @@ symbian:{ TARGET.EPOCALLOWDLLDATA = 1 TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - qmlminehuntfiles.files = MinehuntCore minehunt.qml - DEPLOYMENT += qmlminehuntfiles } # Allow network access on Symbian diff --git a/demos/embedded/qmlcalculator/deployment.pri b/demos/embedded/qmlcalculator/deployment.pri index a97498e91f..3be65eaef2 100644 --- a/demos/embedded/qmlcalculator/deployment.pri +++ b/demos/embedded/qmlcalculator/deployment.pri @@ -4,5 +4,7 @@ symbian { qmlcalculator_uid3 = A000E3FB qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3 } -qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core +qmlcalculator_files.files = \ + $$qmlcalculator_src/qml/calculator/calculator.qml \ + $$qmlcalculator_src/qml/calculator/CalculatorCore DEPLOYMENT += qmlcalculator_files diff --git a/demos/embedded/qmlclocks/deployment.pri b/demos/embedded/qmlclocks/deployment.pri index 6c6704ccc7..a3c977aafb 100644 --- a/demos/embedded/qmlclocks/deployment.pri +++ b/demos/embedded/qmlclocks/deployment.pri @@ -4,5 +4,7 @@ symbian { qmlclocks_uid3 = A000E3FC qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3 } -qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content +qmlclocks_files.files = \ + $$qmlclocks_src/qml/clocks/clocks.qml \ + $$qmlclocks_src/qml/clocks/content DEPLOYMENT += qmlclocks_files diff --git a/demos/embedded/qmldialcontrol/deployment.pri b/demos/embedded/qmldialcontrol/deployment.pri index a9784439a4..392f2d9e55 100644 --- a/demos/embedded/qmldialcontrol/deployment.pri +++ b/demos/embedded/qmldialcontrol/deployment.pri @@ -4,5 +4,7 @@ symbian { qmldialcontrol_uid3 = A000E3FD qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 } -qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content +qmldialcontrol_files.files = \ + $$qmldialcontrol_src/qml/dialcontrol/dialcontrol.qml \ + $$qmldialcontrol_src/qml/dialcontrol/content DEPLOYMENT += qmldialcontrol_files diff --git a/demos/embedded/qmleasing/deployment.pri b/demos/embedded/qmleasing/deployment.pri index 946fcd9d89..c01b203a7f 100644 --- a/demos/embedded/qmleasing/deployment.pri +++ b/demos/embedded/qmleasing/deployment.pri @@ -4,5 +4,7 @@ symbian { qmleasing_uid3 = A000E3FE qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3 } -qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content +qmleasing_files.files = \ + $$qmleasing_src/qml/easing/easing.qml \ + $$qmleasing_src/qml/easing/content DEPLOYMENT += qmleasing_files diff --git a/demos/embedded/qmlflickr/deployment.pri b/demos/embedded/qmlflickr/deployment.pri index a38dc95f8c..248529addd 100644 --- a/demos/embedded/qmlflickr/deployment.pri +++ b/demos/embedded/qmlflickr/deployment.pri @@ -4,5 +4,8 @@ symbian { qmlflickr_uid3 = A000E3FF qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3 } -qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile +qmlflickr_files.files = \ + $$qmlflickr_src/qml/flickr/flickr.qml \ + $$qmlflickr_src/qml/flickr/common \ + $$qmlflickr_src/qml/flickr/mobile DEPLOYMENT += qmlflickr_files diff --git a/demos/embedded/qmlphotoviewer/deployment.pri b/demos/embedded/qmlphotoviewer/deployment.pri index 23882e3686..d5b59da951 100644 --- a/demos/embedded/qmlphotoviewer/deployment.pri +++ b/demos/embedded/qmlphotoviewer/deployment.pri @@ -4,5 +4,7 @@ symbian { qmlphotoviewer_uid3 = A000E400 qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3 } -qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore +qmlphotoviewer_files.files = \ + $$qmlphotoviewer_src/qml/photoviewer/photoviewer.qml \ + $$qmlphotoviewer_src/qml/photoviewer/PhotoViewerCore DEPLOYMENT += qmlphotoviewer_files diff --git a/demos/embedded/qmltwitter/deployment.pri b/demos/embedded/qmltwitter/deployment.pri index 3edc0e527c..de09fba18e 100644 --- a/demos/embedded/qmltwitter/deployment.pri +++ b/demos/embedded/qmltwitter/deployment.pri @@ -4,5 +4,7 @@ symbian { qmltwitter_uid3 = A000E401 qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3 } -qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore +qmltwitter_files.files = \ + $$qmltwitter_src/qml/twitter/twitter.qml \ + $$qmltwitter_src/qml/twitter/TwitterCore DEPLOYMENT += qmltwitter_files |