diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-19 03:38:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-19 03:38:07 (GMT) |
| commit | c08eed6bec191364a31aecbf5cf33277c637bd7e (patch) | |
| tree | 4f8294362daddba008feed41d122aa6556e1ed9d /src/s60installs | |
| parent | 9e937ab81ca069d18d04b3192bc48b22a8cc5308 (diff) | |
| parent | 31514ab488c610056973318f5a950d925155d480 (diff) | |
| download | Qt-c08eed6bec191364a31aecbf5cf33277c637bd7e.zip Qt-c08eed6bec191364a31aecbf5cf33277c637bd7e.tar.gz Qt-c08eed6bec191364a31aecbf5cf33277c637bd7e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 1e5ce0f..76f1dda 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -58,7 +58,7 @@ symbian: { " \"$$pluginLocations/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" \ " \"$$bearerPluginLocation/qsymbianbearer$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qsymbianbearer$${QT_LIBINFIX}.dll\"" \ "ENDIF" \ - " \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\" + " \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\"" } else { # No need to deploy plugins for older platform versions when building on Symbian3 or later qts60plugindeployment = \ |