diff -r bf4420e9fa4d -r 2e16851ffecd browserui.pri
--- a/browserui.pri	Fri Jun 11 16:23:26 2010 +0100
+++ b/browserui.pri	Thu Jul 22 16:30:16 2010 +0100
@@ -1,59 +1,46 @@
 #
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
 # All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 2.1 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
 #
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, 
+# see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 #
-# Contributors:
+# Description:
 #
-# Description: 
+#   BrowserUi - common settings - browserui.pri
+#
+#   any edits made here that are common to app and mw should also be made 
+#   in the mw\browser\browser.pri file
 #
 
-# Build using default nestwork access mgr
-#DEFINES+=NO_NETWORK_ACCESS_MANAGER
-
-# Build without page resizing on load 
-#DEFINES+=NO_RESIZE_ON_LOAD
-
-# Build without gestures
-DEFINES += NO_QSTM_GESTURE
-
-# Build without chrome
-#DEFINES += __gva_no_chrome__
-
-# Enable setting Default IAP 
-symbian: {  
- !contains(what, plat_101) { 
-        # Enable setting Default IAP 
-        DEFINES += SET_DEFAULT_IAP 
-    } 
-}
-
-# Enable perfTracer
-#DEFINES += ENABLE_PERF_TRACE
 
 isEmpty(_BROWSERUI_PRI_INCLUDED_): {
-    
+
     _BROWSERUI_PRI_INCLUDED_=1
 
     symbian {
         CONFIG += debug_and_release
         MMP_RULES += EXPORTUNFROZEN
     }
-   
+
     CONFIG(debug, debug|release) {
         SUBDIRPART = Debug
     } else {
         SUBDIRPART = Release
     }
-    
+
     # Figure out the root of where stuff should go (this could be done via configure)
-    
+
     symbian {
         OUTPUT_DIR = $$PWD
     } else {
@@ -67,18 +54,52 @@
     DESTDIR = $$OUTPUT_DIR/WrtBuild/$$SUBDIRPART/bin
     QMAKE_RPATHDIR = $$DESTDIR $$QMAKE_RPATHDIR
     QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR
-    
+
     # Add the output dirs to the link path too
     LIBS += -L$$DESTDIR
-    
+
     DEPENDPATH += .
     INCLUDEPATH += .
 
     QMAKE_CXXFLAGS_DEBUG += -g
-    
+
     CONFIG(gcov)   {
        LIBS +=   -lgcov
        QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
     }
+    #########################
+    # Feature Flags     
+    #########################
+    br_mobility_bearer=no
+    br_mobility_sysinfo=no
+    br_fast_allocator=no
+    br_download_mgr=no
+    br_default_iap=no
+    br_orbit_ui=no
+    br_openurl=no
+    br_tiled_backing_store=no
+    
+    # For now Symbian only, Windows, Maemo will use the defaults    
+    symbian {
+       contains (browser_addon, fivezero) {
+          br_fast_allocator=yes
+          br_download_mgr=yes
+          br_mobility_sysinfo=yes
+          br_mobility_bearer=yes
+       }
+       contains (browser_addon, ninetwo) {
+          br_fast_allocator=yes
+          br_download_mgr=yes
+          br_mobility_sysinfo=yes
+          br_mobility_bearer=yes
+       }
+       isEmpty (browser_addon){
+          browser_addon=no
+          br_mobility_sysinfo=yes
+          br_mobility_bearer=yes
+          br_orbit_ui=yes
+          br_openurl=yes
+       }
+    }
 }