Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (95 commits)
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  ...

2 files changed, 30 insertions, 2 deletions

diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index 0b1265bd8a..dd7201644d 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -313,7 +313,7 @@
     ARM INTEGRITY target:
 
     \code
-    ./configure --hostprefix=$PWD -embedded integrity -xplatform unsupported/qws/integrity-arm-cxarm -static -qt-kbd-integrity -qt-mouse-integrity -no-mouse-linuxtp -no-mouse-pc -no-kbd-tty -qt-gfx-integrityfb -no-qt3support -no-gfx-linuxfb -no-glib -no-openssl -no-largefile -little-endian -arch integrity -prefix / -opensource -no-feature-QWS_MULTIPROCESS -no-feature-SHAREDMEMORY -no-feature-PROCESS -no-feature-SYSTEMSEMAPHORE -no-feature-PRINTER -no-feature-QWS_QPF2 -no-scripttools
+    ./configure --hostprefix=$PWD -embedded integrity -xplatform unsupported/qws/integrity-arm-cxarm -static -qt-kbd-integrity -qt-mouse-integrity -no-mouse-linuxtp -no-mouse-pc -no-kbd-tty -qt-gfx-integrityfb -no-qt3support -no-gfx-linuxfb -no-glib -no-openssl -no-largefile -little-endian -arch integrity -prefix / -opensource -no-feature-QWS_MULTIPROCESS -no-feature-SHAREDMEMORY -no-feature-PROCESS -no-feature-SYSTEMSEMAPHORE -no-feature-PRINTER -no-feature-QWS_QPF2 -no-libtiff -no-exceptions -no-scripttools
     \endcode
 
     \list
@@ -326,6 +326,7 @@
     \o \c{-no-qt3support} - required since the Qt3 support classes are not supported on INTEGRITY
     \o \c{-no-exceptions} - reduces the size of the library by disabling exception support
     \o \c{-no-openssl} - disable support for OpenSSL
+    \o \c(-no-libtiff} - disable support for libTIFF
     \o \c{-no-glib} - disable support for unavailable Glib
     \o \c{-no-largefile} - disable support for large (> 2TB) files
     \o \c{-no-scripttools} - disable support for QtScript tools
@@ -346,7 +347,13 @@
        of INTEGRITY_DIR and INTEGRITY_BSP in unsupported/qws/integrity-arm-cxarm/qmake.conf.
        If you do not do this, you will have to modify the resulting generated projects.gpj
 
-    \o GIF support is currently not enabled.
+    \o Compilation of native preprocessing tools (moc, rcc, uic) is not automatic. From
+       a Linux shell or a MingWin shell, you can run the following command to compile these tools :
+       \code
+       cd src/tools/bootstrap && make && cd ../rcc && make && cd ../moc && make && cd ../uic && make && cd ../../..
+       \endcode
+
+    \o GIF and TIFF support are currently not enabled.
 
     \o Default .int files are generated. You may want to modify the amount of heap assigned
        to each example by modifying the HeapSize declaration in the specific example .int file.
diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 5abb0e368c..269aa44079 100644
--- a/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -314,3 +314,24 @@ int main(int argc, char *argv[])
     ...
 }
 //! [29]
+
+//! [30]
+QSettings settings(QApplication::applicationDirPath() + "/MySoft.conf");
+//! [30]
+
+//! [31]
+#include <QSettings>
+#include <QDesktopServices>
+int main(int argc, char *argv[])
+{
+#ifdef Q_OS_SYMBIAN
+    // Use QDesktopServices:storageLocation as QApplication is not yet created
+    QSettings::setPath(
+        QSettings::NativeFormat, QSettings::UserScope,
+        QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/settings");
+#endif
+    QApplication app(argc, argv);
+
+    ...
+}
+//! [31]