diff options
Diffstat (limited to 'doc/global')
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 18 | ||||
| -rw-r--r-- | doc/global/externalsites/qch-urls.qdoc | 4 | ||||
| -rw-r--r-- | doc/global/externalsites/qt-webpages.qdoc | 15 | ||||
| -rw-r--r-- | doc/global/manifest-meta.qdocconf | 39 |
4 files changed, 65 insertions, 11 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index bc1a8d492a..194967832f 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -62,28 +62,28 @@ */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#command:find_package + \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package \title CMake find_package Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:AUTOMOC + \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#prop_tgt:AUTOMOC \title CMake AUTOMOC Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:LOCATION + \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#prop_tgt:LOCATION \title CMake LOCATION Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#prop_tgt:POSITION_INDEPENDENT_CODE + \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#prop_tgt:POSITION_INDEPENDENT_CODE \title CMake POSITION_INDEPENDENT_CODE Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.9/cmake.html#command:target_link_libraries + \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:target_link_libraries \title CMake target_link_libraries Documentation */ @@ -259,22 +259,22 @@ */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/0134436989/trolltech/t + \externalpage http://www.amazon.com/Threads-Primer-Guide-Multithreaded-Programming/dp/0134436989/ref=sr_1_1?ie=UTF8&qid=1354884049&sr=8-1&keywords=a+guide+to+multithreaded+programming \title Threads Primer: A Guide to Multithreaded Programming */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/0131900676/trolltech/t + \externalpage http://www.amazon.com/Thread-Time-MultiThreaded-Programming-Guide/dp/0131900676/ref=sr_1_sc_3?ie=UTF8&qid=1354884427&sr=8-3-spell&keywords=The+Mulltithread+Programming+Guide \title Thread Time: The Multithreaded Programming Guide */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/1565921151/trolltech/t + \externalpage http://www.amazon.com/Pthreads-Programming-Standard-Multiprocessing-Nutshell/dp/1565921151/ref=sr_1_1?s=books&ie=UTF8&qid=1354884565&sr=1-1&keywords=threads+Programming%3A+A+POSIX+Standard+for+Better+Multiprocessing \title Pthreads Programming: A POSIX Standard for Better Multiprocessing */ /*! - \externalpage http://www.amazon.com/exec/obidos/ASIN/1565922964/trolltech/t + \externalpage http://www.amazon.com/Win32-Multithreaded-Programming-Aaron-Cohen/dp/B00007GW3Z/ref=sr_1_1?s=books&ie=UTF8&qid=1354884647&sr=1-1&keywords=Win32+Multithreaded+Programming \title Win32 Multithreaded Programming */ diff --git a/doc/global/externalsites/qch-urls.qdoc b/doc/global/externalsites/qch-urls.qdoc index e099669dd6..f8ff8df7a0 100644 --- a/doc/global/externalsites/qch-urls.qdoc +++ b/doc/global/externalsites/qch-urls.qdoc @@ -38,7 +38,7 @@ \title external: Publishing Applications to Ovi Store */ /*! - \externalpage http://doc.qt.digia.com/qtcreator/index.html + \externalpage http://qt-project.org/doc/qtcreator \title external: Qt Creator Manual */ /*! @@ -90,6 +90,6 @@ \title external: Qt Mobility Examples */ /*! - \externalpage http://doc-snapshot.qt-project.org/qtcreator-2.6/creator-overview.html + \externalpage http://qt-project.org/doc/qtcreator/creator-overview.html \title external: Qt Creator Overview */ diff --git a/doc/global/externalsites/qt-webpages.qdoc b/doc/global/externalsites/qt-webpages.qdoc index c83d5e1c94..f7bb9b1b89 100644 --- a/doc/global/externalsites/qt-webpages.qdoc +++ b/doc/global/externalsites/qt-webpages.qdoc @@ -90,3 +90,18 @@ \externalpage http://qt-project.org/wiki/jom \title jom */ + +/*! + \externalpage http://qt-project.org/doc/qt-4.8 + \title Qt 4.8 Reference Documentation +*/ + +/*! + \externalpage http://qt-project.org/doc/qt-4.8/qtquick.html + \title Qt Quick 1 Reference Documentation +*/ + +/*! + \externalpage http://qt-project.org/wiki/Qt-Localization + \title external: Translating Qt Into Other Languages +*/ diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 3bfc3e12d4..d4b2f9f066 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -31,3 +31,42 @@ # # manifestmeta.global.names = * # manifestmeta.global.tags = qt5 + +manifestmeta.filters = highlighted webkit1 webkit2 + +manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ + "QtQuick/Qt Quick Demo - Photo Surface" \ + "QtQuick/Qt Quick Demo - Tweet Search" \ + "QtQuick/Qt Quick Demo - Maroon*" \ + "QtQuick/Qt Quick Demo - Calqlatr" \ + "QtQuick/Qt Quick Particles Examples - Emitters" \ + "QtQuick/Qt Quick Examples - Shader Effects" \ + "QtWebKitExamples/Fancy Browser" \ + "QtWebKitExamples/Flickr View Example" \ + "QtWebKitExamples/YouTube View Example" \ + "QtQuickControls/Qt Quick Controls - Gallery" \ + "QtQuickControls/Qt Quick Controls - Text Editor Example" \ + "QtQuickControls/Qt Quick Controls - Table View Example" \ + "QtWidgets/Application Example" + +manifestmeta.highlighted.attributes = isHighlighted:true + +# Add 'webkit1' tag for QtWebKit1 examples +manifestmeta.webkit1.names = "QtWebKitExamples/Tab Browser" \ + "QtWebKitExamples/DOM Traversal Example" \ + "QtWebKitExamples/Fancy Browser Example" \ + "QtWebKitExamples/Form Extractor Example" \ + "QtWebKitExamples/WebKit Frame Capture Example" \ + "QtWebKitExamples/The Webkit Bridge Tutorial*" \ + "QtWebKitExamples/Previewer Example" \ + "QtWebKitExamples/Wheel Scroller Example" \ + "QtWebKitExamples/Simple Selector Example" \ + "QtWebKitExamples/QObject XML Model Example" + +manifestmeta.webkit1.tags = webkit1 + +# Add 'webkit2' tag for QtWebKit2 examples +manifestmeta.webkit2.names = "QtWebKitExamples/Flickr View Example" \ + "QtWebKitExamples/YouTube View Example" + +manifestmeta.webkit2.tags = webkit2 |