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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  QS60Style: provide more standard icons
  Update QtOpenGL section in Symbian platform notes.
  The qmlshadersplugin deployment must be scoped same as its building
  Do not try to open VKB if it is already open in Symbian
  Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine

1 files changed, 88 insertions, 0 deletions

diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index 8ec5eb9..0e76cf2 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -62,6 +62,94 @@ enum {
     PM_CbaIconHeight
     };
 
+enum {
+    SP_CustomToolBarAdd = QStyle::SP_CustomBase + 1,
+    SP_CustomToolBarAddDetail,
+    SP_CustomToolBarAgain,
+    SP_CustomToolBarAgenda,
+    SP_CustomToolBarAudioOff,
+    SP_CustomToolBarAudioOn,
+    SP_CustomToolBarBack,
+    SP_CustomToolBarBluetoothOff,
+    SP_CustomToolBarBluetoothOn,
+    SP_CustomToolBarCancel,
+    SP_CustomToolBarDelete,
+    SP_CustomToolBarDone,
+    SP_CustomToolBarEdit,
+    SP_CustomToolBarEditDisabled,
+    SP_CustomToolBarEmailSend,
+    SP_CustomToolBarEmergencyCall,
+    SP_CustomToolBarFavouriteAdd,
+    SP_CustomToolBarFavouriteRemove,
+    SP_CustomToolBarFavourites,
+    SP_CustomToolBarGo,
+    SP_CustomToolBarHome,
+    SP_CustomToolBarImageTools,
+    SP_CustomToolBarList,
+    SP_CustomToolBarLock,
+    SP_CustomToolBarLogs,
+    SP_CustomToolBarMenu,
+    SP_CustomToolBarNewContact,
+    SP_CustomToolBarNewGroup,
+    SP_CustomToolBarNextFrame,
+    SP_CustomToolBarNowPlay,
+    SP_CustomToolBarOptions,
+    SP_CustomToolBarOther,
+    SP_CustomToolBarOvi,
+    SP_CustomToolBarPreviousFrame,
+    SP_CustomToolBarRead,
+    SP_CustomToolBarRedoDisabled,
+    SP_CustomToolBarRedo,
+    SP_CustomToolBarRefresh,
+    SP_CustomToolBarRemoveDetail,
+    SP_CustomToolBarRemoveDisabled,
+    SP_CustomToolBarRepeat,
+    SP_CustomToolBarRepeatOff,
+    SP_CustomToolBarRepeatOne,
+    SP_CustomToolBarSearch,
+    SP_CustomToolBarSearchDisabled,
+    SP_CustomToolBarSelectContent,
+    SP_CustomToolBarSelfTimer,
+    SP_CustomToolBarSend,
+    SP_CustomToolBarSendDimmed,
+    SP_CustomToolBarShare,
+    SP_CustomToolBarShift,
+    SP_CustomToolBarShuffle,
+    SP_CustomToolBarShuffleOff,
+    SP_CustomToolBarSignalOff,
+    SP_CustomToolBarSignalOn,
+    SP_CustomToolBarSync,
+    SP_CustomToolBarTools,
+    SP_CustomToolBarTrim,
+    SP_CustomToolBarUnlock,
+    SP_CustomToolBarUnmark,
+    SP_CustomToolBarView,
+    SP_CustomToolBarWlanOff,
+    SP_CustomToolBarWlanOn,
+    SP_CustomCameraCaptureButton,
+    SP_CustomCameraCaptureButtonPressed,
+    SP_CustomCameraPauseButton,
+    SP_CustomCameraPauseButtonPressed,
+    SP_CustomCameraPlayButton,
+    SP_CustomCameraPlayButtonPressed,
+    SP_CustomCameraRecButton,
+    SP_CustomCameraRecButtonPressed,
+    SP_CustomCameraStopButton,
+    SP_CustomCameraStopButtonPressed,
+    SP_CustomTabAll,
+    SP_CustomTabArtist,
+    SP_CustomTabFavourite,
+    SP_CustomTabGenre,
+    SP_CustomTabLanguage,
+    SP_CustomTabMusicAlbum,
+    SP_CustomTabPhotosAlbum,
+    SP_CustomTabPhotosAll,
+    SP_CustomTabPlaylist,
+    SP_CustomTabServices,
+    SP_CustomTabSongs,
+    SP_CustomTabVideos
+};
+
 class QS60StylePrivate;
 
 class Q_GUI_EXPORT QS60Style : public QCommonStyle