Merge remote-tracking branch 'mainline/4.8'

8 files changed, 63 insertions, 38 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index 253e1b4..9d67386 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -14,6 +14,8 @@ win32:!win32-g++* {
 }
 
 COPYWEBKITGUIDE = $$QT_SOURCE_TREE/examples/webkit/webkit-guide
+COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt
+COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html
 
 $$unixstyle {
     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
@@ -21,12 +23,14 @@ $$unixstyle {
     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
     QDOC = $$replace(QDOC, "/", "\\")
     COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
+    COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
+    COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
 }
 ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
 QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
                (cd $$QT_BUILD_TREE && \
-                    $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$QT_BUILD_TREE/doc-build/html-qt && \
+                    $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \
                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
                     $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
                     $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
@@ -52,7 +56,7 @@ win32-g++*:isEmpty(QMAKE_SH) {
 }
 
 # Build rules:
-adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE && $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$QT_BUILD_TREE/doc/html)
+adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE && $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGB)
 adp_docs.depends += sub-qdoc3 # qdoc3
 qch_docs.commands = $$QT_DOCUMENTATION
 qch_docs.depends += sub-qdoc3
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/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/index.qdoc b/doc/src/index.qdoc
index af418e0..bebd41a 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -38,7 +38,7 @@
             \list
             \o \l{Qt Features Overview}
             \o \l{How to Learn Qt}
-            \o \l{Introduction to Qt Quick}
+            \o \l{Introduction to Qt Quick}{Qt Quick}
             \o \l{external: Qt Mobility Manual}{Qt Mobility}
             \o \l{Qt WebKit}
             \endlist
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/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