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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
  QLocalSocket::isValid on Windows must check for broken connection
  fix pipe handle leak in qlocalsocket_win.cpp
  GraphicsViewBenchmark: Run app in full screen mode on small desktops.
  Fix Thai text on Windows 7
  Fix License headers.
  QTextCodec::codecForName.  Insert in the cache in all cases.
  Prevented calling the pixmap filter implementations with null pixmaps.
  Make it possible to run benchmarks with the "-graphicssystem" switch.
  Add support for running the GraphicsViewBenchmark application manually.
  Bump version to 4.6.3.
  Fixed a GLX warning that occured with some Intel chipsets under X11.
  Fixed compile for maemo6.
  Cleanup QEglContext & EGLDisplays
  Moved 'hasAlpha' property from GL2 engine to GL paint device.
  Remove useless qDebug in QTextCodec autotest
  QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
  Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
  Add benchmark for QTextCodec
  Fix several bugs with GL texture cache
  Compile fix for OpenGL ES.
  ...

1 files changed, 85 insertions, 0 deletions

diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.qrc b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.qrc
new file mode 100644
index 0000000..18ae04d
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/GraphicsViewBenchmark.qrc
@@ -0,0 +1,85 @@
+<RCC>
+    <qresource prefix="/themes/blue">
+        <file alias="background.svg">resources/blue_SVG/blue_background_360x640px.svg</file>
+        <file alias="background_horisontal.svg">resources/blue_SVG/blue_background_horisontal_640x360px.svg</file>
+        <file alias="contact_default_icon.svg">resources/blue_SVG/blue_contact_default_icon_52x52px.svg</file>
+        <file alias="contact_list_divider.svg">resources/blue_SVG/blue_contact_list_divider_360x76px.svg</file>
+        <file alias="contact_list_highlighter.svg">resources/blue_SVG/blue_contact_list_highlighter_360x76px.svg</file>
+        <file alias="contact_status_idle.svg">resources/blue_SVG/blue_contact_status_idle_33x33px.svg</file>
+        <file alias="contact_status_offline.svg">resources/blue_SVG/blue_contact_status_offline_33x33px.svg</file>
+        <file alias="contact_status_online.svg">resources/blue_SVG/blue_contact_status_online_33x33px.svg</file>
+        <file alias="scrollbar.svg">resources/blue_SVG/blue_scrollbar_7x14px.svg</file>
+        <file alias="scroll.svg">resources/blue_SVG/blue_scroll_16x80px.svg</file>
+        <file alias="status_field_left.svg">resources/blue_SVG/blue_status_field_left_14x24px.svg</file>
+        <file alias="status_field_middle.svg">resources/blue_SVG/blue_status_field_middle_14x24px.svg</file>
+        <file alias="status_field_right.svg">resources/blue_SVG/blue_status_field_right_14x24px.svg</file>
+        <file alias="topbar.svg">resources/blue_SVG/blue_topbar_356x96px.svg</file>
+        <file alias="topbar_horisontal.svg">resources/blue_SVG/blue_topbar_horisontal_636x96px.svg</file>
+        <file alias="user_default_icon.svg">resources/blue_SVG/blue_user_default_icon_68x68px.svg</file>
+        <file alias="user_status_idle.svg">resources/blue_SVG/blue_user_status_idle_38x38px.svg</file>
+        <file alias="user_status_offline.svg">resources/blue_SVG/blue_user_status_offline_38x38px.svg</file>
+        <file alias="user_status_online.svg">resources/blue_SVG/blue_user_status_online_38x38px.svg</file>
+    </qresource>
+    
+    <qresource prefix="/themes/lime">
+        <file alias="background.svg">resources/lime_SVG/lime_background_360x640px.svg</file>
+        <file alias="background_horisontal.svg">resources/lime_SVG/lime_background_horisontal_640x360px.svg</file>
+        <file alias="contact_default_icon.svg">resources/lime_SVG/lime_contact_default_icon_53x53px.svg</file>
+        <file alias="contact_default_icon_highlight.svg">resources/lime_SVG/lime_contact_default_icon_highlight_53x53px.svg</file>
+        <file alias="contact_list_divider.svg">resources/lime_SVG/lime_contact_list_divider_360x76px.svg</file>
+        <file alias="contact_list_highlighter.svg">resources/lime_SVG/lime_contact_list_highlighter_357x80px.svg</file>
+        <file alias="contact_status_idle.svg">resources/blue_SVG/blue_contact_status_idle_33x33px.svg</file>
+        <file alias="contact_status_offline.svg">resources/blue_SVG/blue_contact_status_offline_33x33px.svg</file>
+        <file alias="contact_status_online.svg">resources/blue_SVG/blue_contact_status_online_33x33px.svg</file>
+        <file alias="scrollbar.svg">resources/lime_SVG/lime_scrollbar_5x14px.svg</file>
+        <file alias="scroll.svg">resources/lime_SVG/lime_scroll_5x80px.svg</file>
+        <file alias="status_field_left.svg">resources/lime_SVG/lime_status_field_left_14x24px.svg</file>
+        <file alias="status_field_middle.svg">resources/lime_SVG/lime_status_field_middle_10x24px.svg</file>
+        <file alias="status_field_right.svg">resources/lime_SVG/lime_status_field_right_14x24px.svg</file>
+        <file alias="topbar.svg">resources/lime_SVG/lime_topbar_356x96px.svg</file>
+        <file alias="topbar_horisontal.svg">resources/lime_SVG/lime_topbar_horisontal_636x96px.svg</file>
+        <file alias="user_default_icon.svg">resources/lime_SVG/lime_user_default_icon_84x68px.svg</file>
+        <file alias="user_status_idle.svg">resources/lime_SVG/lime_user_status_idle_24x24px.svg</file>
+        <file alias="user_status_offline.svg">resources/lime_SVG/lime_user_status_offline_24x24px.svg</file>
+        <file alias="user_status_online.svg">resources/lime_SVG/lime_user_status_online_24x24px.svg</file>
+    </qresource>
+    
+    <qresource prefix="/avatars">
+        <file alias="avatar_001.png">resources/avatars/avatar_man_001_58x58.png</file>
+        <file alias="avatar_002.png">resources/avatars/avatar_man_002_58x58.png</file>
+        <file alias="avatar_003.png">resources/avatars/avatar_man_003_58x58.png</file>
+        <file alias="avatar_004.png">resources/avatars/avatar_man_004_58x58.png</file>
+        <file alias="avatar_005.png">resources/avatars/avatar_man_005_58x58.png</file>
+        <file alias="avatar_006.png">resources/avatars/avatar_man_006_58x58.png</file>
+        <file alias="avatar_007.png">resources/avatars/avatar_man_007_58x58.png</file>
+        <file alias="avatar_008.png">resources/avatars/avatar_man_008_58x58.png</file>
+        <file alias="avatar_009.png">resources/avatars/avatar_man_009_58x58.png</file>
+        <file alias="avatar_010.png">resources/avatars/avatar_man_010_58x58.png</file>
+
+        <file alias="avatar_011.png">resources/avatars/avatar_picture_001_58x58.png</file>
+        <file alias="avatar_012.png">resources/avatars/avatar_picture_002_58x58.png</file>
+        <file alias="avatar_013.png">resources/avatars/avatar_picture_003_58x58.png</file>
+        <file alias="avatar_014.png">resources/avatars/avatar_picture_004_58x58.png</file>
+        <file alias="avatar_015.png">resources/avatars/avatar_picture_005_58x58.png</file>
+        
+        <file alias="avatar_016.png">resources/avatars/avatar_woman_001_58x58.png</file>
+        <file alias="avatar_017.png">resources/avatars/avatar_woman_002_58x58.png</file>
+        <file alias="avatar_018.png">resources/avatars/avatar_woman_003_58x58.png</file>
+        <file alias="avatar_019.png">resources/avatars/avatar_woman_004_58x58.png</file>
+        <file alias="avatar_020.png">resources/avatars/avatar_woman_005_58x58.png</file>
+        <file alias="avatar_021.png">resources/avatars/avatar_woman_006_58x58.png</file>
+        <file alias="avatar_022.png">resources/avatars/avatar_woman_007_58x58.png</file>
+        <file alias="avatar_023.png">resources/avatars/avatar_woman_008_58x58.png</file>
+        <file alias="avatar_024.png">resources/avatars/avatar_woman_009_58x58.png</file>
+        <file alias="avatar_025.png">resources/avatars/avatar_woman_010_58x58.png</file>
+    </qresource>
+
+    <qresource prefix="/contact">
+        <file alias="areacodes.txt">resources/contacts/areacodes.txt</file>
+        <file alias="firstnamesF.txt">resources/contacts/firstnamesF.txt</file>
+        <file alias="firstnamesM.txt">resources/contacts/firstnamesM.txt</file>
+        <file alias="lastnames.txt">resources/contacts/lastnames.txt</file>
+    </qresource>
+  
+</RCC>
+