From 054049046e89d6e18d800f4728d4927354b640c6 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Thu, 8 Jul 2010 15:44:49 +1000
Subject: Quiet qmake warnings during configure.

Configure runs qmake on all .pro files in the source tree. Wrapping
symbian only code in symbian scopes prevents warnings about unset
EPOCROOT on other platforms.

Task-number: QTBUG-11996
---
 src/plugins/bearer/symbian/3_2/3_2.pro             | 16 +++++++++-------
 src/plugins/bearer/symbian/symbian_3/symbian_3.pro | 22 ++++++++++++----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/plugins/bearer/symbian/3_2/3_2.pro b/src/plugins/bearer/symbian/3_2/3_2.pro
index 3404dde..6f3ecaf 100644
--- a/src/plugins/bearer/symbian/3_2/3_2.pro
+++ b/src/plugins/bearer/symbian/3_2/3_2.pro
@@ -1,12 +1,14 @@
 include(../symbian.pri)
 
-exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
-exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
-   DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
-   LIBS += -lcmmanager
-} else {
-   # Fall back to 3_1 implementation on platforms that do not have cmmanager
-   LIBS += -lapengine
+symbian {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
+    exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
+        DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
+        LIBS += -lcmmanager
+    } else {
+        # Fall back to 3_1 implementation on platforms that do not have cmmanager
+        LIBS += -lapengine
+    }
 }
 
 TARGET = $${TARGET}_3_2
diff --git a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
index 804986a..25f18f2 100644
--- a/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
+++ b/src/plugins/bearer/symbian/symbian_3/symbian_3.pro
@@ -1,17 +1,19 @@
 include(../symbian.pri)
 
-exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
-exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
-    DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
-    LIBS += -lcmmanager
+symbian {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \
+    exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) {
+        DEFINES += SNAP_FUNCTIONALITY_AVAILABLE
+        LIBS += -lcmmanager
 
-    exists($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h)) {
-        DEFINES += OCC_FUNCTIONALITY_AVAILABLE
-        LIBS += -lextendedconnpref
+        exists($$MW_LAYER_PUBLIC_EXPORT_PATH(extendedconnpref.h)) {
+            DEFINES += OCC_FUNCTIONALITY_AVAILABLE
+            LIBS += -lextendedconnpref
+        }
+    } else {
+        # Fall back to 3_1 implementation on platforms that do not have cmmanager
+        LIBS += -lapengine
     }
-} else {
-   # Fall back to 3_1 implementation on platforms that do not have cmmanager
-   LIBS += -lapengine
 }
 
 TARGET.UID3 = 0x20021319
-- 
cgit v0.12


From e45b8dceca9c424815c6b08355a95cb34382186c Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 12 Jul 2010 12:10:45 +1000
Subject: Fix qdoc error.

Task-number: QTBUG-12078
Reviewed-By: Trust Me
---
 doc/src/external-resources.qdoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index cbd66ee..61c9da2 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -416,5 +416,5 @@
 
 /*!
     \externalpage http://opensource.org/licenses/bsd-license.php
-    \title New and Modified BSD Licenses
-*/
\ No newline at end of file
+    \title BSD License
+*/
-- 
cgit v0.12