From f90c18e09e8b2e275230080cb51656e3f8a31fba Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 19 Oct 2011 10:43:24 +0200 Subject: Doc: adding link to the Qt Quick Components for Symbian page. Reviewed-by: Geir Vattekar --- doc/src/declarative/declarativeui.qdoc | 1 + doc/src/mainpage.qdoc | 1 + doc/src/platforms/supported-platforms.qdoc | 5 +++++ doc/src/qt-webpages.qdoc | 5 +++++ 4 files changed, 12 insertions(+) diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index cecccf6..4201cf1 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -82,6 +82,7 @@ Qt applications. \section1 QML Add-Ons \list +\o \l{Qt Quick Components for Symbian 1.1}{Qt Quick Components for Symbian} - a native component set for the Symbian^3 platform \o \l{QtWebKit QML Module} \o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins} \endlist diff --git a/doc/src/mainpage.qdoc b/doc/src/mainpage.qdoc index 41818ee..154d14c 100644 --- a/doc/src/mainpage.qdoc +++ b/doc/src/mainpage.qdoc @@ -110,6 +110,7 @@ applications using layouts and Qt Quick interfaces with QML. \o \l{Qt Quick} - create UIs using QML \list \o \l{external: Developing Qt Quick Applications}{Creator's QML Design Mode} - design Qt Quick interfaces using Creator's design mode + \o \l{Qt Quick Components for Symbian 1.1}{Qt Quick Components for Symbian} - a native QML component set for the Symbian^3 platform \endlist \o \l{Widgets and Layouts} - primary elements for C++ based interfaces \list diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index ba59c37..92bf12d 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -465,6 +465,8 @@ \o \l{Platform and Compiler Notes - Symbian}{Platform Notes - Symbian} - Platform specific notes. \o \l{Getting Started Guides}{Getting started} + \o \l{Qt Quick Components for Symbian 1.1}{Qt Quick Components for Symbian} + - provides a QML component set for the Symbian^3 platform \endlist \section1 Key Features for Symbian Development @@ -481,6 +483,9 @@ time and lines of code required for traditional UI styling with Qt Style Sheets. + The \l{Qt Quick Components for Symbian 1.1}{Qt Quick Components for Symbian 1.1} + provides a native QML component set. + \section2 Graphics Features Qt for Symbian contains a powerful paint engine that provides diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index f67ff83..c4d400d 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -554,3 +554,8 @@ \externalpage http://labs.qt.nokia.com/2011/05/03/qt-modules-maturity-level/ \title Qt Modules' Maturity Level - Description */ + +/*! + \externalpage http://doc.qt.nokia.com/qtquick-components-symbian-1.1/index.html + \title Qt Quick Components for Symbian 1.1 +*/ \ No newline at end of file -- cgit v0.12 From a0d738e5addfbee866c5b5185d14d74a43d51b11 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Fri, 21 Oct 2011 12:18:54 +0200 Subject: Fix security issue on website due to bad JS. Reviewed-by: Trust Me --- doc/src/template/scripts/functions.js | 13 +------------ tools/qdoc3/doc/config/scripts/functions.js | 13 +------------ tools/qdoc3/test/qt-html-templates-online.qdocconf | 13 ------------- tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf | 11 ----------- tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf | 11 ----------- 5 files changed, 2 insertions(+), 59 deletions(-) diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index 3ab4a08..af204d8 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -183,17 +183,6 @@ var blankRE=/^\s*$/; function CheckEmptyAndLoadList() { - /* Start Extracting information for feedback and adding this to the feedback form */ - var pageUrl = window.location.pathname; - var pageVal = $('title').html(); - $('#pageType').removeClass('red'); - $('#feedUrl').remove(); - $('#pageVal').remove(); - $('.menuAlert').remove(); - $('#feedform').append(''); - $('#feedform').append(''); - /* End Extracting information for feedback and adding this to the feedback form */ - /* extracts search query */ var value = document.getElementById('pageType').value; /* if the search is less than three chars long remove class names and remove elements from old search*/ @@ -255,4 +244,4 @@ function CheckEmptyAndLoadList() }); }, 500); /* timer set to 500 ms */ }); - }); \ No newline at end of file + }); diff --git a/tools/qdoc3/doc/config/scripts/functions.js b/tools/qdoc3/doc/config/scripts/functions.js index 62bc535..af204d8 100755 --- a/tools/qdoc3/doc/config/scripts/functions.js +++ b/tools/qdoc3/doc/config/scripts/functions.js @@ -183,17 +183,6 @@ var blankRE=/^\s*$/; function CheckEmptyAndLoadList() { - /* Start Extracting information for feedback and adding this to the feedback form */ - var pageUrl = window.location.href; - var pageVal = $('title').html(); - $('#pageType').removeClass('red'); - $('#feedUrl').remove(); - $('#pageVal').remove(); - $('.menuAlert').remove(); - $('#feedform').append(''); - $('#feedform').append(''); - /* End Extracting information for feedback and adding this to the feedback form */ - /* extracts search query */ var value = document.getElementById('pageType').value; /* if the search is less than three chars long remove class names and remove elements from old search*/ @@ -255,4 +244,4 @@ function CheckEmptyAndLoadList() }); }, 500); /* timer set to 500 ms */ }); - }); \ No newline at end of file + }); diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf index 3584b68..073f1aa 100644 --- a/tools/qdoc3/test/qt-html-templates-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf @@ -142,8 +142,6 @@ HTML.postpostheader = \ "
\n" HTML.footer = \ - "
\n" \ - " [+] Documentation Feedback
\n" \ "
\n" \ " \n" \ " \n" \ @@ -169,16 +167,5 @@ HTML.footer = \ " Free Documentation License version 1.3\n" \ " as published by the Free Software Foundation.

\n" \ " \n" \ - "
\n" \ - "
X
\n" \ - "
\n" \ - "

Thank you for giving your feedback.

Make sure it is related to this specific page. For more general bugs and \n" \ - " requests, please use the Qt Bug Tracker.

\n" \ - "

\n" \ - "

\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ "\n" \ " \n" diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf index 8dc17af..ed94494 100644 --- a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf @@ -139,8 +139,6 @@ HTML.postpostheader = \ HTML.footer = \ " \n" \ - "
\n" \ - " [+] Documentation Feedback
\n" \ " \n" \ " \n" \ "
\n" \ @@ -164,13 +162,4 @@ HTML.footer = \ " Alternatively, this document may be used under the terms of the GNU\n" \ " Free Documentation License version 1.3\n" \ " as published by the Free Software Foundation.

\n" \ - "
\n" \ - "
\n" \ - "
X
\n" \ - "
\n" \ - "

\n" \ - "

\n" \ - "
\n" \ - "
\n" \ - "
\n" \ "
\n" diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf index e7e8220..ec0dc18 100644 --- a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf +++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf @@ -139,8 +139,6 @@ HTML.postpostheader = \ HTML.footer = \ " \n" \ - "
\n" \ - " [+] Documentation Feedback
\n" \ " \n" \ " \n" \ "
\n" \ @@ -164,13 +162,4 @@ HTML.footer = \ " Alternatively, this document may be used under the terms of the GNU\n" \ " Free Documentation License version 1.3\n" \ " as published by the Free Software Foundation.

\n" \ - "
\n" \ - "
\n" \ - "
X
\n" \ - "
\n" \ - "

\n" \ - "

\n" \ - "
\n" \ - "
\n" \ - "
\n" \ "
\n" -- cgit v0.12