diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 06:10:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 06:10:27 (GMT) |
| commit | 9e85af3454bd0a2d962523d52e688f9bc7259528 (patch) | |
| tree | f9c52865c980616c156c2380b7b7514eb1deaa2a /src/s60installs | |
| parent | 3030bb7cfecf5db7cc8de14791369a015f5abb32 (diff) | |
| parent | 3e12d523ce4e2839bda0c1f709134cc6d3f507b3 (diff) | |
| download | Qt-9e85af3454bd0a2d962523d52e688f9bc7259528.zip Qt-9e85af3454bd0a2d962523d52e688f9bc7259528.tar.gz Qt-9e85af3454bd0a2d962523d52e688f9bc7259528.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Added setSwitchPolicy to MeeGo graphicssystem helper API.
Add /q switch to QMAKE_DEL_FILE command in symbian
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 1c91422..1b5a5ce 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 = \ |