--- a/ganeswidgets/ganeswidgets.pro	Thu Jun 24 12:59:29 2010 +0300
+++ b/ganeswidgets/ganeswidgets.pro	Thu Jul 08 15:37:35 2010 +0300
@@ -19,8 +19,7 @@
 DEPENDPATH += .
 INCLUDEPATH += . \
     inc \
-    $$MW_LAYER_SYSTEMINCLUDE \
-    /sf/mw/hb/src/hbcore/gui
+    $$MW_LAYER_SYSTEMINCLUDE
 LIBS += -lestor.dll \
     -lhbcore \
     -lhbwidgets \

--- a/ganeswidgets/src/hgwidgets_p.cpp	Thu Jun 24 12:59:29 2010 +0300
+++ b/ganeswidgets/src/hgwidgets_p.cpp	Thu Jul 08 15:37:35 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include <QApplication>
-#include <hbscrollbar_p.h>
+#include <HbScrollbar>
 #include <hgwidgets/hgwidgets.h>
 
 #include "hgwidgets_p.h"

--- a/hgcacheproxymodel/src/hgbuffermanager.cpp	Thu Jun 24 12:59:29 2010 +0300
+++ b/hgcacheproxymodel/src/hgbuffermanager.cpp	Thu Jul 08 15:37:35 2010 +0300
@@ -13,7 +13,7 @@
 *
 * Description:
 *
-*  Version     : %version: 6 %
+*  Version     : %version: 7 %
 */
 #include "hgbuffermanager.h"
 #include <hgwidgets/hgcacheproxymodel.h>
@@ -30,7 +30,13 @@
 mBufferSize( aBufferSize ),
 mBufferTreshold( aBufferTreshold ),
 mBufferPosition( aInitialPosition ),
-mTotalCount( aTotalCount )
+mDiff(0),
+mTotalCount( aTotalCount ),
+mResetOrdered(false),
+mRequestStart(0),
+mRequestCount(0),
+mReleaseStart(0),
+mReleaseCount(0)
 {
     ASSERT( mObserver != 0 );
     mBufferPosition -= (mBufferSize / 2);

--- a/hgcacheproxymodel/tsrc/unit/test_hgcacheproxydatamodel.cpp	Thu Jun 24 12:59:29 2010 +0300
+++ b/hgcacheproxymodel/tsrc/unit/test_hgcacheproxydatamodel.cpp	Thu Jul 08 15:37:35 2010 +0300
@@ -13,7 +13,7 @@
 *
 * Description:
 *
-*  Version     : %version: 10 %
+*  Version     : %version: 11 %
 */
 #include <QtTest/QtTest>
 #include <hgwidgets/hgcacheproxymodel.h>
@@ -1425,5 +1425,23 @@
         return QTest::qExec(&tc, c, v);
     }
 #else
-    QTEST_MAIN(TestCacheProxy)
+    int main (int argc, char* argv[]) 
+    {
+        for ( int i=0;i<argc; i++){
+            if (strcmp(argv[i], "-o")==0 && i+1 <argc ){
+                //let's make sure that folder specified after -o exists
+                QDir file( QString::fromLatin1( argv[i+1] ));
+                QString s = file.absolutePath ();
+                s = s.left( s.lastIndexOf(file.dirName()) );
+                if ( !file.exists(s) ){
+                    file.mkpath(s);
+                }
+            }
+        }
+        
+        QApplication app(argc, argv);
+        QTEST_DISABLE_KEYPAD_NAVIGATION
+        TestCacheProxy tc;
+        return QTest::qExec(&tc, argc, argv);
+    }
 #endif

--- a/hgcacheproxymodel/tsrc/unit/unittest_hgcacheproxymodel.pro	Thu Jun 24 12:59:29 2010 +0300
+++ b/hgcacheproxymodel/tsrc/unit/unittest_hgcacheproxymodel.pro	Thu Jul 08 15:37:35 2010 +0300
@@ -12,9 +12,7 @@
 TEMPLATE = app
 TARGET = unittest_hgcacheproxymodel
 
-#fix that later
-#CONFIG += symbian_test
-
+CONFIG += symbian_test
 CONFIG += hb
 INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE $$APP_LAYER_SYSTEMINCLUDE
 
@@ -23,7 +21,7 @@
 
 TARGET.CAPABILITY = ALL -TCB
 
-DEFINES += _CACHEPROXYDATAMODEL_UNITTEST_LOG_TO_C
+#DEFINES += _CACHEPROXYDATAMODEL_UNITTEST_LOG_TO_C
 
 # Input
 LIBS +=     -lhgcacheproxymodel \

--- a/layers.sysdef.xml	Thu Jun 24 12:59:29 2010 +0300
+++ b/layers.sysdef.xml	Thu Jul 08 15:37:35 2010 +0300
@@ -16,7 +16,8 @@
     </layer>
 
     <layer name="unit_test_layer">
-      <module name="hgwidgets_unit_tests">
+      <module name="hgcacheproxy_unit_test">
+        <unit unitID="imm.hgwidgets.hgcacheproxy_unit_test" name="hgcacheproxy_unit_test" bldFile="&layer_real_source_path;/hgcacheproxymodel/tsrc/unit/" proFile="unittest_hgcacheproxymodel.pro" mrp="" />
       </module>
     </layer>