From 04330bc93d9ee9c389ae37a560e2b10c0d59024c Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 6 May 2009 15:59:35 +0300
Subject: Remaining support for selfsigned Qt libs packages removed.

---
 src/plugins/qpluginbase.pri | 6 +-----
 src/s60installs/qt_libs.pro | 7 +------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index d772fae..47ad4a1 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -16,9 +16,5 @@ wince*:LIBS += $$QMAKE_LIBS_GUI
 
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
-    contains(QT_EDITION, OpenSource) {
-        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData
-    } else {
-        TARGET.CAPABILITY = All -Tcb        
-    }
+    TARGET.CAPABILITY = All -Tcb        
 }
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
index 7e34a56..064d6a5 100644
--- a/src/s60installs/qt_libs.pro
+++ b/src/s60installs/qt_libs.pro
@@ -6,12 +6,7 @@ symbian: {
 
     SUBDIRS=
     TARGET = "QtLibs pre-release"
-    contains(QT_EDITION, OpenSource) {
-        # Can't use UID in protected range for self signed packages.
-        TARGET.UID3 = 0xE001E61C
-    } else {
-        TARGET.UID3 = 0x2001E61C
-    }
+    TARGET.UID3 = 0x2001E61C
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
     qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc 
-- 
cgit v0.12