Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (58 commits)
  Fine-tune the tests being run on the CI system.
  Standardize selection color in visual test
  Use GLIBC functions on any GLIBC architecture.
  tst_qnetworkreply: Fix ugly test
  Fix license text.
  Remove pointSize from visual tests
  Update visuals for X11
  Doc: fix a typo in QML/Qt UI integration
  Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
  Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
  Remove some excess pngs
  Update qml visual tests
  VisualDataModel::count should be 0 until a valid delegate is set.
  Doc: Remove default from PathView path property
  Record images on more than just the first frame.
  Turn off font antialiasing during tests.
  Shrink size of a visual test
  doc: Fix documentation of QTextEdit::setDocument
  Fixed QGesture autotest for QGesture lazy deletion.
  compile with quintptr instead of intptr_t
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/bearer/symbian/symbianengine.h b/src/plugins/bearer/symbian/symbianengine.h
index 7c1076e..337d4d1 100644
--- a/src/plugins/bearer/symbian/symbianengine.h
+++ b/src/plugins/bearer/symbian/symbianengine.h
@@ -207,6 +207,7 @@ private: // Data
     TBool              iInitOk;
     TBool              iUpdateGoingOn;
     TBool              iUpdatePending;
+    TBool              iScanInQueue;
 
     AccessPointsAvailabilityScanner* ipAccessPointsAvailabilityScanner;
 
@@ -234,9 +235,10 @@ protected: // From CActive
     void DoCancel();
 
 private: // Data
-    SymbianEngine& iOwner;
+    SymbianEngine&      iOwner;
     RConnectionMonitor& iConnectionMonitor;
-    TConnMonIapInfoBuf iIapBuf;
+    TConnMonIapInfoBuf  iIapBuf;
+    TBool               iScanActive;
 };
 
 QT_END_NAMESPACE