diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-28 07:40:30 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-28 07:40:30 (GMT) |
| commit | 427c35771a83cce39f5f48c188c180d35ef6ecc9 (patch) | |
| tree | 31164c83e5cf610cee9c505e857141866995664d /doc/src/snippets/code | |
| parent | 7a35cb66f1ca6e90655ece3c726f8d2c01c68b53 (diff) | |
| parent | f65e60b49395d68be78259ec82c9969b267e591c (diff) | |
| download | Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.zip Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.tar.gz Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qtestlib.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qtwebkit.qdoc | 8 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp | 35 |
3 files changed, 1 insertions, 44 deletions
diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc index ff52b2f..a0e4944 100644 --- a/doc/src/snippets/code/doc_src_qtestlib.qdoc +++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc @@ -61,7 +61,7 @@ void TestQString::toUpper() //! [9] -/myTestDirectory$ qmake -project "QT += testlib" +/myTestDirectory$ qmake -project "CONFIG += qtestlib" /myTestDirectory$ qmake /myTestDirectory$ make //! [9] diff --git a/doc/src/snippets/code/doc_src_qtwebkit.qdoc b/doc/src/snippets/code/doc_src_qtwebkit.qdoc deleted file mode 100644 index d4fc2bd..0000000 --- a/doc/src/snippets/code/doc_src_qtwebkit.qdoc +++ /dev/null @@ -1,8 +0,0 @@ -//! [0] -QT += webkit -//! [0] - - -//! [1] -#include <QtWebKit> -//! [1] diff --git a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp b/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp deleted file mode 100644 index f04cd29..0000000 --- a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp +++ /dev/null @@ -1,35 +0,0 @@ - -void wrapInFunction() -{ - -//! [0] - view->page()->history(); -//! [0] - - -//! [1] - view->page()->settings(); -//! [1] - - -//! [2] - view->triggerAction(QWebPage::Copy); -//! [2] - - -//! [3] - view->page()->triggerPageAction(QWebPage::Stop); -//! [3] - - -//! [4] - view->page()->triggerPageAction(QWebPage::GoBack); -//! [4] - - -//! [5] - view->page()->triggerPageAction(QWebPage::GoForward); -//! [5] - -} - |