Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
	dist/changes-4.8.0

1 files changed, 21 insertions, 0 deletions

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]