Merge branch 'master' into new_info_panels

[situare] / images.qrc

diff --git a/images.qrc b/images.qrc
index 9186ac0..db10aff 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -2,13 +2,34 @@
     <qresource prefix="/">
         <file>res/images/arrow_left.png</file>
         <file>res/images/arrow_right.png</file>
-        <file>res/images/clock_small.png</file>
-        <file>res/images/compas_small.png</file>
-        <file>res/images/facebook_user_64.png</file>
-        <file>res/images/list_small.png</file>
-        <file>res/images/reload_icon.png</file>
-        <file>res/images/sendPosition_icon.png</file>
+        <file>res/images/clock.png</file>
+        <file>res/images/compass.png</file>
+        <file>res/images/envelope.png</file>
         <file>res/images/zoom_in.png</file>
         <file>res/images/zoom_out.png</file>
+        <file>res/images/personal_info_bckgrnd.png</file>
+        <file>res/images/profile_pic_border.png</file>
+        <file>res/images/refresh.png</file>
+        <file>res/images/refresh_s.png</file>
+        <file>res/images/send_position.png</file>
+        <file>res/images/send_position_s.png</file>
+        <file>res/images/show_position.png</file>
+        <file>res/images/show_position_s.png</file>
+        <file>res/images/side_bar_left.png</file>
+        <file>res/images/side_bar_right.png</file>
+        <file>res/images/sliding_bar_left.png</file>
+        <file>res/images/sliding_bar_right.png</file>
+        <file>res/images/led_red.png</file>
+        <file>res/images/led_red_s.png</file>
+        <file>res/images/list_item.png</file>
+        <file>res/images/list_item_bottom.png</file>
+        <file>res/images/list_item_middle.png</file>
+        <file>res/images/list_item_top.png</file>
+        <file>res/images/sliding_bar_left_test.png</file>
+        <file>res/images/userpanel_mask.png</file>
+        <file>res/images/sliding_bar_right_test.png</file>
+        <file>res/images/gps_pos_accurate.png</file>
+        <file>res/images/gps_pos_coarse.png</file>
+        <file>res/images/friend_group.png</file>
     </qresource>
 </RCC>