summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-12 15:46:28 (GMT)
committeraxis <qt-info@nokia.com>2010-02-12 15:48:02 (GMT)
commitcfdf813056c5e6063e97bd01266c249ec2f9ecf1 (patch)
tree73131ed6a5d346c04901259cfd1725764304d5a8
parent949fd8c023af83e5a91701259699e2ebde06b4c3 (diff)
downloadQt-cfdf813056c5e6063e97bd01266c249ec2f9ecf1.zip
Qt-cfdf813056c5e6063e97bd01266c249ec2f9ecf1.tar.gz
Qt-cfdf813056c5e6063e97bd01266c249ec2f9ecf1.tar.bz2
Fixed position of plugins on Symbian.
-rw-r--r--src/plugins/s60/s60pluginbase.pri2
-rw-r--r--src/s60installs/s60installs.pro2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri
index c1aa4ef..1a6f4a2 100644
--- a/src/plugins/s60/s60pluginbase.pri
+++ b/src/plugins/s60/s60pluginbase.pri
@@ -4,6 +4,8 @@ include(../qpluginbase.pri)
CONFIG -= plugin
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60
+
MMP_RULES += NOEXPORTLIBRARY
defBlock = \
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 60676ab..c5d5830 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -32,7 +32,7 @@ symbian: {
}
} else {
defineReplace(pluginLocations) {
- return ($$QT_BUILD_TREE/src/plugins/s60/$$1)
+ return ($$QT_BUILD_TREE/plugins/s60/$$1)
}
}