From cfdf813056c5e6063e97bd01266c249ec2f9ecf1 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 12 Feb 2010 16:46:28 +0100
Subject: Fixed position of plugins on Symbian.

---
 src/plugins/s60/s60pluginbase.pri | 2 ++
 src/s60installs/s60installs.pro   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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)
         }
     }
 
-- 
cgit v0.12