diff -r 56cd8111b7f7 -r 41300fa6a67c src/qbase.pri
--- a/src/qbase.pri	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/qbase.pri	Tue Feb 02 00:43:10 2010 +0200
@@ -4,7 +4,7 @@
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
 TEMPLATE	= lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.6.0
+   VERSION=4.6.1
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 }
@@ -36,7 +36,7 @@
 CONFIG          += qmake_cache target_qt 
 CONFIG          -= fix_output_dirs
 win32|mac:!macx-xcode:CONFIG += debug_and_release
-linux-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
+linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
@@ -102,16 +102,28 @@
         "DEFFILE ../s60installs/eabi/$${TARGET}.def" \
         "$${LITERAL_HASH}endif"
 
-        #with defBlock enabled, removed exported symbols are treated as errors
-        #and there is binary compatibility between successive builds.
-        #with defBlock disabled, binary compatibility is broken every time you build
-        MMP_RULES += defBlock
-        
-        #with EXPORTUNFROZEN enabled, new exports are included in the dll without
-        #needing to run abld freeze, however binary compatibility is only maintained
-        #for symbols that are frozen (and only if defBlock is also enabled)
-        #the downside of EXPORTUNFROZEN is that the linker gets run twice
-        #MMP_RULES += EXPORTUNFROZEN
+        contains(QT_CONFIG, private_tests) {
+            #When building autotest configuration, there are extra exports from
+            #the Qt DLLs, which we don't want in the frozen DEF files.
+            
+            # :QTP:Always use DEF files
+            # MMP_RULES += EXPORTUNFROZEN
+            MMP_RULES += defBlock
+        } else {
+            #When building without autotests, DEF files are used by default.
+            #This is to maintain binary compatibility with previous releases.
+            
+            #with defBlock enabled, removed exported symbols are treated as errors
+            #and there is binary compatibility between successive builds.
+            #with defBlock disabled, binary compatibility is broken every time you build
+            MMP_RULES += defBlock
+
+            #with EXPORTUNFROZEN enabled, new exports are included in the dll without
+            #needing to run abld freeze, however binary compatibility is only maintained
+            #for symbols that are frozen (and only if defBlock is also enabled)
+            #the downside of EXPORTUNFROZEN is that the linker gets run twice
+            #MMP_RULES += EXPORTUNFROZEN
+        }
     }
     load(armcc_warnings)
 }