From 91b3cea424e08e7480fb32987f757206d885504c Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 11 Jun 2010 16:51:18 +0300
Subject: Fix symbian-abld build failure with bearer plugins

All different Symbian bearer plugins had same UID which caused
duplicate extension makefiles. Assigned each dll different UID.

Reviewed-by: Jason Barron
---
 src/plugins/bearer/symbian/3_1/3_1.pro             | 1 +
 src/plugins/bearer/symbian/3_2/3_2.pro             | 1 +
 src/plugins/bearer/symbian/symbian.pri             | 2 --
 src/plugins/bearer/symbian/symbian_3/symbian_3.pro | 2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/bearer/symbian/3_1/3_1.pro b/src/plugins/bearer/symbian/3_1/3_1.pro
index a60d18b..2d721a8 100644
--- a/src/plugins/bearer/symbian/3_1/3_1.pro
+++ b/src/plugins/bearer/symbian/3_1/3_1.pro
@@ -2,3 +2,4 @@ include(../symbian.pri)
 
 LIBS += -lapengine
 TARGET = $${TARGET}_3_1
+TARGET.UID3 = 0x2002131C
diff --git a/src/plugins/bearer/symbian/3_2/3_2.pro b/src/plugins/bearer/symbian/3_2/3_2.pro
index 4e5b416..3404dde 100644
--- a/src/plugins/bearer/symbian/3_2/3_2.pro
+++ b/src/plugins/bearer/symbian/3_2/3_2.pro
@@ -10,3 +10,4 @@ exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
 }
 
 TARGET = $${TARGET}_3_2
+TARGET.UID3 = 0x2002131D
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
index bfcd9ed..afe84dc 100644
--- a/src/plugins/bearer/symbian/symbian.pri
+++ b/src/plugins/bearer/symbian/symbian.pri
@@ -10,8 +10,6 @@ SOURCES += ../symbianengine.cpp \
            ../qnetworksession_impl.cpp \
            ../main.cpp
 
-TARGET.UID3=0x20021319
-
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 symbian-abld:INCLUDEPATH += $$QT_BUILD_TREE/include/QtNetwork/private
 
diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
index 455aa67..f9d486e 100644
--- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
+++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
@@ -12,3 +12,5 @@ exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
    # Fall back to 3_1 implementation on platforms that do not have cmmanager
    LIBS += -lapengine
 }
+
+TARGET.UID3 = 0x20021319
-- 
cgit v0.12