diff options
| author | axis <qt-info@nokia.com> | 2010-06-29 12:07:01 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-06-29 12:14:36 (GMT) |
| commit | 2de30dafb76388b4e9ea5b8d6ea385d81da7ea37 (patch) | |
| tree | 71aff75bc6765bd4c954cb8b8021fbdbc4bb474c | |
| parent | b6687616708d953df52c84d4e9bc06196a75c553 (diff) | |
| download | Qt-2de30dafb76388b4e9ea5b8d6ea385d81da7ea37.zip Qt-2de30dafb76388b4e9ea5b8d6ea385d81da7ea37.tar.gz Qt-2de30dafb76388b4e9ea5b8d6ea385d81da7ea37.tar.bz2 | |
Fixed deployment paths for the symbian/linux-armcc mkspec.
Paths to executables matter on that build system, unlike on Raptor.
RevBy: Trust me
3 files changed, 7 insertions, 6 deletions
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro index 416e58b..ca74c38 100644 --- a/demos/embedded/fluidlauncher/fluidlauncher.pro +++ b/demos/embedded/fluidlauncher/fluidlauncher.pro @@ -118,7 +118,7 @@ symbian { } contains(QT_CONFIG, multimedia) { - reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc + reg_resource.sources += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc) } @@ -202,10 +202,11 @@ symbian { } contains(QT_CONFIG, multimedia) { - executables.sources += spectrum.exe fftreal.dll - resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc + executables.sources += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe + executables.sources += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll + resource.sources += $$appResourceDir(demos/spectrum/app/spectrum.rsc) mifs.sources += \ - $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif + $$appResourceDir(demos/spectrum/app/spectrum.mif) } contains(QT_CONFIG, script) { diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index c7e7843..7149986 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -22,7 +22,7 @@ symbian:{ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 - importFiles.sources = qmlimageproviderplugin.dll ImageProviderCore/qmldir + importFiles.sources = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir importFiles.path = ImageProviderCore DEPLOYMENT = importFiles } diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 3ec7d29..2e610f9 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -17,7 +17,7 @@ symbian:{ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 - importFiles.sources = qmlqwidgetsplugin.dll QWidgets/qmldir + importFiles.sources = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir importFiles.path = QWidgets DEPLOYMENT = importFiles |