Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7

Conflicts:
	src/network/ssl/qsslcertificate.cpp

10 files changed, 99 insertions, 39 deletions

diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc
index cb83542..0ebf8ae 100644
--- a/doc/src/declarative/network.qdoc
+++ b/doc/src/declarative/network.qdoc
@@ -134,10 +134,9 @@ One of the URL schemes built into Qt is the "qrc" scheme. This allows content to
 the executable using \l{The Qt Resource System}. Using this, an executable can reference QML content
 that is compiled into the executable:
 
-\code
-    QDeclarativeView *canvas = new QDeclarativeView;
-    canvas->setUrl(QUrl("qrc:/dial.qml"));
-\endcode
+\quotefromfile snippets/declarative/qtbinding/resources/main.cpp
+\skipto view
+\printuntil setSource
 
 The content itself can then use relative URLs, and so be transparently unaware that the content is
 compiled into the executable.
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc
index 2f68f3d..5204cc6 100644
--- a/doc/src/deployment/qt-conf.qdoc
+++ b/doc/src/deployment/qt-conf.qdoc
@@ -48,7 +48,7 @@
 
     \o \c :/qt/etc/qt.conf using the resource system
 
-    \o on Mac OS X, in the Resource directory inside the appliction
+    \o on Mac OS X, in the Resource directory inside the application
     bundle, for example \c assistant.app/Contents/Resources/qt.conf
 
     \o in the directory containing the application executable, i.e.
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 184a881..2c7fda2 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1184,6 +1184,10 @@
     Any rules you define will be added after automatically generated
     rules in each section.
 
+    \note Content specified using \c BLD_INF_RULES is inserted as-is into the \c bld.inf
+    file, so any rules that specify host side paths may not work correctly when doing
+    a shadow build.
+
     \target CONFIG
     \section1 CONFIG
 
@@ -1521,6 +1525,10 @@
     override languages statement, you must override also package-header
     statement and all other statements which are language specific.
 
+    \note Custom deployments specified using \c pkg_postrules are inserted
+    as-is into the \c PKG file, so any rules that specify host side paths may not
+    work correctly when doing a shadow build.
+
     On the Symbian platform, three separate PKG files are generated:
 
     \list
@@ -1911,6 +1919,10 @@
     \c TARGET.EPOCSTACKSIZE.
     Doing so could result in duplicate statements in the MMP file.
 
+    \note Content specified using \c MMP_RULES is inserted as-is into the \c MMP
+    file, so any rules that specify host side paths may not work correctly when doing
+    a shadow build.
+
     \target MOC_DIR
     \section1 MOC_DIR
 
@@ -3116,6 +3128,23 @@
     platform application shell. In addition it will make the application to
     be launched in background.
 
+    From S60 version 5.4 onwards, you can specify \c graphics_memory value using \c RSS_RULES
+    to specify the graphics memory quota for the application. The value is in kilobytes and
+    defaults to 24576 (i.e. 24MB) for applications that link against QtGui. The default for all
+    other applications is zero.
+
+    The graphics memory quota tells the operating system how much graphics memory the
+    application is likely to need so that it can free up enough graphics memory prior to
+    application launch. If the value is too small, it can cause random slowdowns later when
+    the memory is freed on on-demand basis. On the other hand, too large values can delay
+    the application launch unnecessarily.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 159
+
+    This example sets the graphics memory quota to 12MB.
+
     For detailed list of possible \c APP_REGISTRATION_INFO statements, please refer to the
     Symbian platform help.
 
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index eda5ee1..d37e8e0 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -38,6 +38,12 @@
     documentation, and find the information you need for the
     application you are developing.
 
+    The code for this tutorial is available in \c
+    {examples/tutorials/gettingStarted/gsQt} under your Qt
+    installation. If you are using the Qt SDK, you will find it in
+    \c{Examples/4.7/tutorials/gettingStarted/gsQt} (change \c{4.7} if
+    you are using a later Qt version).
+
     \section1 Hello Notepad
 
     In this first example, we simply create and show a text edit in a
@@ -139,28 +145,28 @@
     Let us take a look at the code.
 
     \code
- 1        #include <QtGui>
- 2
- 3        int main(int argv, char **args)
- 4        {
- 5            QApplication app(argv, args);
- 6
- 7            QTextEdit textEdit;
- 8            QPushButton quitButton("Quit");
- 9
-10            QObject::connect(&quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
-11
-12            QVBoxLayout layout;
-13            layout.addWidget(&textEdit);
-14            layout.addWidget(&quitButton);
-15
-16            QWidget window;
-17            window.setLayout(&layout);
-18
-19            window.show();
-20
-21            return app.exec();
-22        }
+ 1      #include <QtGui>
+ 2 
+ 3      int main(int argv, char **args)
+ 4      {
+ 5          QApplication app(argv, args);
+ 6 
+ 7          QTextEdit *textEdit = new QTextEdit;
+ 8          QPushButton *quitButton = new QPushButton("&Quit");
+ 9 
+10          QObject::connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
+11 
+12          QVBoxLayout *layout = new QVBoxLayout;
+13          layout->addWidget(textEdit);
+14          layout->addWidget(quitButton);
+15 
+16          QWidget window;
+17          window.setLayout(layout);
+18 
+19          window.show();
+20 
+21          return app.exec();
+22      }
     \endcode
 
     Line 1 includes QtGui, which contains all of Qt's GUI classes.
@@ -278,9 +284,25 @@
     visible strings. This function is necessary when you want to
     provide your application in more than one language (e.g.  English
     and Chinese). We will not go into details here, but you can follow
-    the \c {Qt Linguist} link from the learn more table. We will not
-    look at the implementation of \c quit() slot and the \c main()
-    function, but you can check out the source code if you want to.
+    the \c {Qt Linguist} link from the learn more table.
+
+    Here is the \c quit() slot:
+
+    \code
+75      void Notepad::quit()
+76      {
+77          QMessageBox messageBox;
+78          messageBox.setWindowTitle(tr("Notepad"));
+79          messageBox.setText(tr("Do you really want to quit?"));
+80          messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+81          messageBox.setDefaultButton(QMessageBox::No);
+82          if (messageBox.exec() == QMessageBox::Yes)
+83              qApp->quit();
+84      }
+    \endcode
+
+    We use the QMessageBox class to display a dialog that asks the
+    user whether he/she really wants to quit.
 
     \section2 Learn More
 
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index c993575..f67ff83 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -221,7 +221,7 @@
     \title Forums on Qt Developer Network
 */
 /*!
-    \externalpage http://developer.qt.nokia.com/wikis
+    \externalpage http://developer.qt.nokia.com/wiki
     \title Wiki on Qt Developer Network
 */
 /*!
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.pro b/doc/src/snippets/code/doc_src_qmake-manual.pro
index ee35b77..042ca0e 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.pro
+++ b/doc/src/snippets/code/doc_src_qmake-manual.pro
@@ -1023,3 +1023,7 @@ packagesExist(sqlite3 QtNetwork QtDeclarative) {
     // Use the fancy UI, as we have extra packages available
 #endif
 #! [158]
+
+#! [159]
+RSS_RULES += "graphics_memory=12288;"
+#! [159]
diff --git a/doc/src/snippets/qcolumnview/main.cpp b/doc/src/snippets/qcolumnview/main.cpp
index c39a4bb..fecff12 100644
--- a/doc/src/snippets/qcolumnview/main.cpp
+++ b/doc/src/snippets/qcolumnview/main.cpp
@@ -76,4 +76,4 @@ int main(int argc, char *argv[])
     columnView.show();
 
     return app.exec();
-}
\ No newline at end of file
+}
diff --git a/doc/src/snippets/textdocument-imagedrop/main.cpp b/doc/src/snippets/textdocument-imagedrop/main.cpp
index 24cd2de..0cdf3a1 100644
--- a/doc/src/snippets/textdocument-imagedrop/main.cpp
+++ b/doc/src/snippets/textdocument-imagedrop/main.cpp
@@ -49,4 +49,4 @@ int main(int argc, char * argv[])
     textEdit->show();
 
     return app.exec();
-}
\ No newline at end of file
+}
diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.h b/doc/src/snippets/textdocument-imagedrop/textedit.h
index 9e0492b..9db9f17 100644
--- a/doc/src/snippets/textdocument-imagedrop/textedit.h
+++ b/doc/src/snippets/textdocument-imagedrop/textedit.h
@@ -46,11 +46,11 @@
 class TextEdit : public QTextEdit
 {
     Q_OBJECT
-    
-public: 
+
+public:
     TextEdit(QWidget *parent=0);
     bool canInsertFromMimeData( const QMimeData *source ) const;
     void insertFromMimeData( const QMimeData *source );
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css
index 44abb3c..d33d8e7 100644
--- a/doc/src/template/style/offline.css
+++ b/doc/src/template/style/offline.css
@@ -74,8 +74,7 @@
 
     body
     {
-        margin-left: 0.5em;
-        margin-right: 0.5em;
+        margin: 0px;
         font-family: sans-serif;
         line-height: normal
     }
@@ -238,7 +237,9 @@
 
     .header .content
     {
-        margin-bottom: 0.5em
+        margin-left: 5px; 
+        margin-top: 5px;
+        margin-bottom: 0.5em;
     }
 
     .header .breadcrumb
@@ -413,6 +414,11 @@
     .flowList dd a{
     }
 
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
     .content .flowList p{
         padding:0px;
     }