Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add version 0.42 of libconninet.
  Remove version 0.41 of libconninet.
  Register QNetworkConfigurationPrivatePointer metatype.
  Mutex is already locked when private member function is called.
  Fixed a typo when doing a lock.
  The QNetworkConfigurationManager did not get the online status correctly even when there was an active connection.
  Release lock before calling into icd engine.
  Do not change the session configuration state because of changes
  Doc: removed assistant style and reintroduced the index page icons.
  Cocoa: Stacking order of modal dialogs is wrong
  qdoc: Added the fix to change qml-qml-file.name to qml-file.name
  Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)
  Make this constructor explicit in Qt too.
  Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.

2 files changed, 4 insertions, 41 deletions

diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index e4ad135..349048f 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -54,7 +54,7 @@
 
     .narrow .header .qtref a
     {
-      color: #363534;
+      color: #00732F;
     }
 
     .narrow .header .qtref span
@@ -103,7 +103,7 @@
     }
     .narrow .header #shortCut ul li a
     {
-      color: #44a51c;
+      color: #00732F;
     }
 
     .narrow .wrapper .hd
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 6a32e53..190c60a 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1283,43 +1283,6 @@
 	
 
 
-/* start of offline spec*/
-    .offline .wrapper .hd
-    {
-        background: url(../images/page.png) no-repeat 0 -15px;
-    }
-	    .offline .wrapper .bd
-    {
-        background: url(../images/bg_l_blank.png) repeat-y 0 0;
-    }
-    .offline .wrapper .ft
-    {
-        background: url(../images/page.png) no-repeat 0 -90px;
-    }
-    .offline .sidebar,
-	.offline .feedback,
-	.offline .t_button,
-	.offline #narrowsearch,
-	.offline #narrowmenu
-    {
-        display: none;
-    }
-    .offline .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-    .offline .wrap .breadcrumb
-    {
-    }
-
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
-
-
-/* end of offline spec*/
-	
 /* start of creator spec*/
 	.creator
 	{
@@ -1339,9 +1302,9 @@
 	.creator #feedbackBox,
 	.creator #feedback,
 	.creator #blurpage,
-	.creator .indexbox .indexIcon span,
+	/*.creator .indexbox .indexIcon span,*/
 	.creator .wrapper .hd,
-	.creator  .indexbox .indexIcon,
+/*	.creator  .indexbox .indexIcon,*/
 	.creator .header #nav-logo,
 	.creator #offlinemenu,
 	.creator #offlinesearch,