diff options
Diffstat (limited to 'doc')
23 files changed, 569 insertions, 327 deletions
diff --git a/doc/global/config.qdocconf b/doc/global/config.qdocconf new file mode 100644 index 0000000000..2b3ca1d6ba --- /dev/null +++ b/doc/global/config.qdocconf @@ -0,0 +1,12 @@ +#Include this file to inherit configuration related to Qt Project based modules. + +dita.metadata.default.author = Qt Project +dita.metadata.default.permissions = all +dita.metadata.default.publisher = Qt Project +dita.metadata.default.copyryear = 2013 +dita.metadata.default.copyrholder = Digia Plc +dita.metadata.default.audience = programmer + +#Set the main Qt index.html +navigation.homepage = "Qt $QT_VER" +buildversion = "Qt $QT_VERSION Reference Documentation" diff --git a/doc/global/fileextensions.qdocconf b/doc/global/fileextensions.qdocconf new file mode 100644 index 0000000000..ec47dc9c7f --- /dev/null +++ b/doc/global/fileextensions.qdocconf @@ -0,0 +1,12 @@ +naturallanguage = en_US +outputencoding = UTF-8 +sourceencoding = UTF-8 + +examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" +examples.imageextensions = "*.png *.jpg *.gif" + +headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" +sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" + +#include the external websites +sourcedirs += externalsites diff --git a/doc/global/html-config.qdocconf b/doc/global/html-config.qdocconf new file mode 100644 index 0000000000..1560db8d98 --- /dev/null +++ b/doc/global/html-config.qdocconf @@ -0,0 +1,29 @@ +#Additional HTML settings + +HTML.nonavigationbar = "false" + +HTML.extraimages += template/images/arrow_bc.png \ + template/images/home.png \ + template/images/ico_out.png \ + template/images/ico_note.png \ + template/images/ico_note_attention.png \ + template/images/btn_prev.png \ + template/images/btn_next.png \ + template/images/bullet_dn.png \ + template/images/bullet_sq.png \ + template/images/bgrContent.png \ + template/images/logo.png + +#specify which files in the output directory should be packed into the qch file. +#these files are assumed to be in each module's output directory."qtquick/images/ico_out.png" for example. +qhp.extraFiles += images/arrow_bc.png \ + images/home.png \ + images/ico_out.png \ + images/ico_note.png \ + images/ico_note_attention.png \ + images/btn_prev.png \ + images/btn_next.png \ + images/bullet_dn.png \ + images/bullet_sq.png \ + images/bgrContent.png \ + images/logo.png diff --git a/doc/global/html-footer.qdocconf b/doc/global/html-footer.qdocconf new file mode 100644 index 0000000000..6c26dc7c29 --- /dev/null +++ b/doc/global/html-footer.qdocconf @@ -0,0 +1,30 @@ +#Default HTML footer for QDoc builds. + +HTML.footer = \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + "</div>\n" \ + "<div class=\"footer\">\n" \ + " <div class=\"qt13a-copyright\" id=\"copyright\">\n" \ + " <div class=\"qt13a-container\">\n" \ + " <p>\n" \ + " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ + " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ + " their respective owners.</p>\n" \ + " <p>\n" \ + " The documentation provided herein is licensed under the terms of the\n" \ + " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \ + " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \ + " <p>\n" \ + " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \ + " www.qt-project.org</a>.</p>\n" \ + " <p>\n" \ + " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " in Finland and/or other countries worldwide. All other trademarks are property\n" \ + " of their respective owners. <a title=\"Privacy Policy\"\n" \ + " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ + " </div>\n" \ + " </div>\n" \ + "</div>\n" \ diff --git a/doc/global/html-header-offline.qdocconf b/doc/global/html-header-offline.qdocconf new file mode 100644 index 0000000000..d84f38fef8 --- /dev/null +++ b/doc/global/html-header-offline.qdocconf @@ -0,0 +1,31 @@ +#Default HTML header for QDoc builds. + +#specify the CSS file used by this template +HTML.stylesheets = template/style/offline.css + +#for including files into the qch file +qhp.extraFiles += style/offline.css + +HTML.headerstyles = \ + " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" + +HTML.endheader = \ + "</head>\n" + +HTML.postheader = \ + "<body>\n" \ + "<div class=\"header\" id=\"qtdocheader\">\n"\ + " <div class=\"main\">\n" \ + " <div class=\"main-rounded\">\n" \ + " <div class=\"navigationbar\">\n"\ + " <ul>\n"\ + + + +HTML.postpostheader = \ + " </ul>\n"\ + " </div>\n" \ + "</div>\n" \ + "<div class=\"content\">\n" \ + "<div class=\"line\">\n" \ + "<div class=\"content mainContent\">\n" \ diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf new file mode 100644 index 0000000000..5c21644a39 --- /dev/null +++ b/doc/global/html-header-online.qdocconf @@ -0,0 +1,64 @@ +#HTML Header with Qt Project branding and online links + +HTML.stylesheets = template/style/online.css + +#for including files into the qch file. Relative to the outputdir of a QDoc build. +# $QT_INSTALL_DOCS/qtquick/style/online.css for example +qhp.extraFiles += style/online.css + +HTML.headerstyles = \ + " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n" + +HTML.endheader = \ + "</head>\n" + +HTML.postheader = \ + "<body>\n" \ + "<div class=\"header\" id=\"qtdocheader\"></div>\n" \ + " <div class=\"nav\" id=\"qt13a-header\">\n" \ + " <div class=\"qt13a-gradient\">\n" \ + " <div class=\"qt13a-container qt13a-dynamicREMOVE\" >\n" \ + " <div id=\"qt13a-register\">\n" \ + " <a href=\"http://qt-project.org/\">Qt Home</a>\n" \ + " <a href=\"https://bugreports.qt-project.org/\">Bug Tracker</a>\n" \ + " <a href=\"https://codereview.qt-project.org/\">Code Review</a>\n" \ + " </div>\n" \ + " <div class=\"qt13a-sixCol\">\n" \ + " <div id=\"qt13a-logo\">\n" \ + " <a href=\"http://qt-project.org/\" class=\"qt13a-site-logo\">\n" \ + " <img src=\"images/Qt-logo.png\" alt=\"Qt\"></img>\n" \ + " </a>\n" \ + " </div>\n" \ + " <div id=\"qt13a-title_nav\">\n" \ + " <div id=\"qt13a-title\">\n" \ + " <p class=\"qt13a-title\">Qt Documentation Snapshots</p>\n" \ + " </div>\n" \ + " <div class=\"qt13a-nav\">\n" \ + " <ul>\n" \ + " <li>\n" \ + " <a href=\"http://doc-snapshot.qt-project.org\">Snapshots</a>\n" \ + " </li>\n" \ + " <li>\n" \ + " <a href=\"http://qt-project.org/doc\">Released</a>\n" \ + " </li>\n" \ + " <li>\n" \ + " <a href=\"http://doc.qt.digia.com\">Archives</a>\n" \ + " </li>\n" \ + " </ul>\n" \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + " </div>\n" \ + " <div class=\"main\">\n" \ + " <div class=\"main-rounded\">\n" \ + " <div class=\"navigationbar\">\n" \ + " <ul>\n" \ + +HTML.postpostheader = \ + " </ul>\n" \ + " </div>\n" \ + "<div class=\"content\">\n" \ + " <div class=\"line\">\n" \ + " <div class=\"content mainContent\">\n" \ diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 1f34f366cb..e65baf6c5f 100644 --- a/doc/global/qt-cpp-ignore.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -1,3 +1,21 @@ +versionsym = QT_VERSION_STR + +defines += Q_QDOC \ + QT_.*_SUPPORT \ + QT_.*_LIB \ + QT_COMPAT \ + QT_KEYPAD_NAVIGATION \ + QT_NO_EGL \ + QT3_SUPPORT \ + Q_WS_.* \ + Q_OS_.* \ + Q_BYTE_ORDER \ + QT_DEPRECATED \ + QT_DEPRECATED_* \ + Q_NO_USING_KEYWORD \ + __cplusplus \ + Q_COMPILER_INITIALIZER_LISTS + Cpp.ignoretokens += \ PHONON_EXPORT \ Q_AUTOTEST_EXPORT \ @@ -84,13 +102,15 @@ Cpp.ignoretokens += \ QT_END_NAMESPACE \ QT_FASTCALL \ QT_WIDGET_PLUGIN_EXPORT \ - QTBLUETOOTH_BEGIN_NAMESPACE \ - QTBLUETOOTH_END_NAMESAPCE \ - QTNFC_BEGIN_NAMESPACE \ - QTNFC_END_NAMESPACE \ + QT_BEGIN_NAMESPACE_NFC \ + QT_END_NAMESPACE_NFC \ + QT_USE_NAMESPACE_NFC \ + QT_BEGIN_NAMESPACE_BLUETOOTH \ + QT_END_NAMESPACE_BLUETOOTH \ + QT_USE_NAMESPACE_BLUETOOTH \ QWEBKIT_EXPORT -Cpp.ignoredirectives = \ +Cpp.ignoredirectives += \ __attribute__ \ K_DECLARE_PRIVATE \ PHONON_HEIR \ diff --git a/doc/global/qt-defines.qdocconf b/doc/global/qt-defines.qdocconf deleted file mode 100644 index 79b13eee92..0000000000 --- a/doc/global/qt-defines.qdocconf +++ /dev/null @@ -1,17 +0,0 @@ -versionsym = QT_VERSION_STR - -defines += Q_QDOC \ - QT_.*_SUPPORT \ - QT_.*_LIB \ - QT_COMPAT \ - QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ - QT3_SUPPORT \ - Q_WS_.* \ - Q_OS_.* \ - Q_BYTE_ORDER \ - QT_DEPRECATED \ - QT_DEPRECATED_* \ - Q_NO_USING_KEYWORD \ - __cplusplus \ - Q_COMPILER_INITIALIZER_LISTS diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index e9b2c6a7a8..cd8315aa9a 100644 --- a/doc/global/qt-html-templates-offline.qdocconf +++ b/doc/global/qt-html-templates-offline.qdocconf @@ -1,4 +1,10 @@ -HTML.nobreadcrumbs = "true" +#include standard set of HTML header and footer. +include(html-config.qdocconf) +include(html-header-offline.qdocconf) +include(html-footer.qdocconf) + +#uncomment if navigation bar is not wanted +#HTML.nonavigationbar = "true" HTML.stylesheets = template/style/offline.css HTML.extraimages += template/images/ico_out.png \ @@ -20,40 +26,3 @@ qhp.extraFiles += style/offline.css \ images/bullet_dn.png \ images/bullet_sq.png \ images/bgrContent.png - - -HTML.headerstyles = \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" - -HTML.endheader = \ - "</head>\n" \ - "<body>\n" \ - "<div class=\"header\" id=\"qtdocheader\"></div>\n"\ - "<div class=\"content\">\n" \ - "<div class=\"line\">\n" \ - "<div class=\"content mainContent\">\n" \ - -HTML.footer = \ - "</div>\n" \ - "</div>\n" \ - "</div>\n" \ - "<div class=\"footer\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.</p>\n" \ - " <br />\n" \ - " <p>\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \ - " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \ - " <p>\n" \ - " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \ - " www.qt-project.org</a>.</p>\n" \ - " <br />\n" \ - " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ - "</div>\n" \ diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf index c794c47679..88abc3429b 100644 --- a/doc/global/qt-html-templates-online.qdocconf +++ b/doc/global/qt-html-templates-online.qdocconf @@ -1,4 +1,10 @@ -HTML.nobreadcrumbs = "true" +#include standard set of HTML header and footer. +include(html-config.qdocconf) +include(html-header-online.qdocconf) +include(html-footer.qdocconf) + +#uncomment if navigation bar is not wanted +#HTML.nonavigationbar = "true" HTML.stylesheets = template/style/online.css HTML.extraimages += template/images/ico_out.png \ @@ -8,67 +14,10 @@ HTML.extraimages += template/images/ico_out.png \ template/images/btn_next.png \ template/images/bullet_dn.png \ template/images/bullet_sq.png \ - template/images/bgrContent.png - -HTML.headerstyles = \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n" - -HTML.endheader = \ - "</head>\n" \ - "<body>\n" \ - "<div class=\"header\" id=\"qtdocheader\"></div>\n" \ - " <header>\n" \ - " <div class=\"nav\">\n" \ - " <a href=\"http://qt-project.org/\">Qt Home</a>\n" \ - " <a href=\"https://bugreports.qt-project.org/\">Bug Tracker</a>\n" \ - " <a href=\"https://codereview.qt-project.org/\">Code Review</a>\n" \ - " </div>\n" \ - " <a href=\"http://qt-project.org/\">\n" \ - " <img src=\"http://doc-snapshot.qt-project.org/images/logo.png\" alt=\"Qt\"></img>\n" \ - " </a>\n" \ - " <div class=\"nav-title\">\n" \ - " <h1 >Qt Documentation Snapshots</h1>\n" \ - " <div class=\"nav-subtitle\">\n" \ - " --snapshots of unreleased Qt documentation\n" \ - " </div>\n" \ - " </div>\n" \ - " <div class=\"nav-main\">\n" \ - " <div class=\"nav-main-content\">\n" \ - " <a href=\"http://doc-snapshot.qt-project.org\">All Modules</a>\n" \ - " </div>\n" \ - " <div class=\"nav-main-content\">\n" \ - " <a href=\"http://qt-project.org/doc\">Qt Releases</a>\n" \ - " </div>\n" \ - " <div class=\"nav-main-content\">\n" \ - " <a href=\"http://doc.qt.digia.com\">Archives</a>\n" \ - " </div>\n" \ - " </div>\n" \ - "</header>\n" \ - "<div class=\"content\">\n" \ - " <div class=\"line\">\n" \ - " <div class=\"content mainContent\">\n" \ - -HTML.footer = \ - " </div>\n" \ - " </div>\n" \ - "</div>\n" \ - "<div class=\"footer\">\n" \ - " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.</p>\n" \ - " <br />\n" \ - " <p>\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation\n" \ - " License version 1.3</a> as published by the Free Software Foundation.</p>\n" \ - " <p>\n" \ - " Documentation sources may be obtained from <a href=\"http://www.qt-project.org\">\n" \ - " www.qt-project.org</a>.</p>\n" \ - " <br />\n" \ - " <p>\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ - "</div>\n" \ + template/images/bgrContent.png \ + template/images/Qt-logo.png \ + template/images/Qt-dark_gradient.png \ + template/images/Qt-footer-bg.jpg \ + template/images/Qt-footer_shadow.png \ + template/images/Qt-gradient.png \ + template/images/Qt-header-bg.jpg diff --git a/doc/global/qt-module-defaults-offline.qdocconf b/doc/global/qt-module-defaults-offline.qdocconf new file mode 100644 index 0000000000..bdca212960 --- /dev/null +++ b/doc/global/qt-module-defaults-offline.qdocconf @@ -0,0 +1,13 @@ +#The default configuration for a Qt 5 module, including Add-Ons and Tools. +#Include this file for a standard Qt 5 module; builds with the offline style. + +#include standard set of macros and C++ defines and ignores +include(macros.qdocconf) +include(qt-cpp-defines.qdocconf) +include(compat.qdocconf) +include(manifest-meta.qdocconf) +include(fileextensions.qdocconf) +include(qt-html-templates-offline.qdocconf) + +#extra configuration data such as file extensions +include(config.qdocconf) diff --git a/doc/global/qt-module-defaults-online.qdocconf b/doc/global/qt-module-defaults-online.qdocconf index 93ecae16fa..258295b4f9 100644 --- a/doc/global/qt-module-defaults-online.qdocconf +++ b/doc/global/qt-module-defaults-online.qdocconf @@ -1,32 +1,14 @@ +#The online onfiguration for a Qt 5 module, including Add-Ons and Tools. +#Online version contains a different header. +#Include this file for a standard Qt 5 module; builds with the online style. + +#include standard set of macros and C++ defines and ignores include(macros.qdocconf) -include(qt-cpp-ignore.qdocconf) -include(qt-defines.qdocconf) -include(qt-html-templates-online.qdocconf) +include(qt-cpp-defines.qdocconf) include(compat.qdocconf) +include(manifest-meta.qdocconf) +include(fileextensions.qdocconf) +include(qt-html-templates-online.qdocconf) -dita.metadata.default.author = Qt Project -dita.metadata.default.permissions = all -dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2013 -dita.metadata.default.copyrholder = Digia Plc -dita.metadata.default.audience = programmer - -naturallanguage = en_US -outputencoding = UTF-8 -sourceencoding = UTF-8 - -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" -examples.imageextensions = "*.png *.jpg *.gif" - -headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" -sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" - -versionsym = QT_VERSION_STR - -macro.raisedaster.HTML = "<sup>*</sup>" - -#for including files into the qch file -qhp.extraFiles += template/style/online.css - -#include the external websites -sourcedirs += externalsites +#extra configuration data DITA information +include(config.qdocconf) diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf index 0365d5a6cd..8d0665ef41 100644 --- a/doc/global/qt-module-defaults.qdocconf +++ b/doc/global/qt-module-defaults.qdocconf @@ -1,30 +1,7 @@ -include(macros.qdocconf) -include(qt-cpp-ignore.qdocconf) -include(qt-defines.qdocconf) -include(qt-html-templates-offline.qdocconf) -include(compat.qdocconf) -include(manifest-meta.qdocconf) +#The default configuration for a Qt 5 module, including Add-Ons and Tools. +#Include this file for a standard Qt 5 module. This file is provided for +#compatibility reasons. -dita.metadata.default.author = Qt Project -dita.metadata.default.permissions = all -dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2013 -dita.metadata.default.copyrholder = Digia Plc -dita.metadata.default.audience = programmer - -naturallanguage = en_US -outputencoding = UTF-8 -sourceencoding = UTF-8 - -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" -examples.imageextensions = "*.png *.jpg *.gif" - -headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" -sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" - -versionsym = QT_VERSION_STR - -macro.raisedaster.HTML = "<sup>*</sup>" - -#include the external websites -sourcedirs += externalsites +#The default is the offline style. The alternate style is in +#qt-module-defaults-online.qdocconf +include(qt-module-defaults-offline.qdocconf) diff --git a/doc/global/template/images/Qt-dark_gradient.png b/doc/global/template/images/Qt-dark_gradient.png Binary files differnew file mode 100644 index 0000000000..6ae10f37bf --- /dev/null +++ b/doc/global/template/images/Qt-dark_gradient.png diff --git a/doc/global/template/images/Qt-footer-bg.jpg b/doc/global/template/images/Qt-footer-bg.jpg Binary files differnew file mode 100644 index 0000000000..c0ff209b7e --- /dev/null +++ b/doc/global/template/images/Qt-footer-bg.jpg diff --git a/doc/global/template/images/Qt-footer_shadow.png b/doc/global/template/images/Qt-footer_shadow.png Binary files differnew file mode 100644 index 0000000000..5a7063dfee --- /dev/null +++ b/doc/global/template/images/Qt-footer_shadow.png diff --git a/doc/global/template/images/Qt-gradient.png b/doc/global/template/images/Qt-gradient.png Binary files differnew file mode 100644 index 0000000000..aa38227cbb --- /dev/null +++ b/doc/global/template/images/Qt-gradient.png diff --git a/doc/global/template/images/Qt-header-bg.jpg b/doc/global/template/images/Qt-header-bg.jpg Binary files differnew file mode 100644 index 0000000000..c9a6d96db4 --- /dev/null +++ b/doc/global/template/images/Qt-header-bg.jpg diff --git a/doc/global/template/images/Qt-logo.png b/doc/global/template/images/Qt-logo.png Binary files differnew file mode 100644 index 0000000000..64c1c4aaa3 --- /dev/null +++ b/doc/global/template/images/Qt-logo.png diff --git a/doc/global/template/images/arrow_bc.png b/doc/global/template/images/arrow_bc.png Binary files differnew file mode 100644 index 0000000000..f2a83a5740 --- /dev/null +++ b/doc/global/template/images/arrow_bc.png diff --git a/doc/global/template/images/logo.png b/doc/global/template/images/logo.png Binary files differnew file mode 100644 index 0000000000..1e7ed4cf21 --- /dev/null +++ b/doc/global/template/images/logo.png diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css index 0e4dd5e9a4..5a036c7f07 100644 --- a/doc/global/template/style/offline.css +++ b/doc/global/template/style/offline.css @@ -181,6 +181,74 @@ footer and license text-align:center } +.navigationbar{ +display: block; +position: relative; +top:-20px; +/*border-top:2px solid #ffffff;*/ +border-bottom: 1px solid #cecece; +background-color:#F2F2F2; +z-index:1; +height:20px; +padding-left:7px; +margin:0px; +padding-top:2px; +margin-left:-5px; +margin-right:-5px; +} + +.navigationbar ul{ + margin:0px; + padding:0px; +} + +.navigationbar ul li{ +list-style-type:none; +padding-top:2px; +padding-left: 4px; +margin:0; +height:20px; +} + +.navigationbar li{ +float:left; +} + +.navigationbar .first { +background:url(../images/home.png); +background-position:left; +background-repeat:no-repeat; +padding-left:20px; +} + + +.navigationbar li a{ +display:block; +text-decoration:none; +background:url(../images/arrow_bc.png); +background-repeat:no-repeat; +background-position:right; +padding-right:17px; +} + + +/* +----------- +footer and license +----------- +*/ +.footer{ +text-align:center +} + +#buildversion{ +font-style: italic; +font-size: small; +float: right; +margin-right: 5px; +} +/* + /* table of content no display */ @@ -441,7 +509,7 @@ padding: 3px 15px 3px 0; .qml{ display: block; -margin: 10; +margin: 10px; overflow: auto; padding: 20px 20px 20px 20px; } @@ -493,7 +561,7 @@ vertical-align:top; -moz-border-radius: 7px 7px 7px 7px; -webkit-border-radius: 7px 7px 7px 7px; border-radius: 7px 7px 7px 7px; - background:#FFF url(../images/bgrContent.png); + background:#FFF url('../images/bgrContent.png'); background-position:top; background-repeat:repeat-x; border: 1px solid #E6E6E6; diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css index 7809783fa7..09c863feff 100644 --- a/doc/global/template/style/online.css +++ b/doc/global/template/style/online.css @@ -1,14 +1,4 @@ -body{ -font: normal 400 14px/1.2 Arial; -font-family: Arial, Helvetica; -color:#313131; -text-align:justify; -margin-left:5px; -margin-right:5px; -background: none repeat scroll 0% 0% rgb(230,231,232); -} - -p { +{ line-height: 20px; } img{ @@ -21,7 +11,9 @@ max-width: 800px; height: auto } -.content{} +.content{ + margin: 15px; +} .descr{ margin-top:35px; @@ -85,7 +77,7 @@ font-weight:bold; } .note,.tip,.fastpath{ -background: #F2F2F2 url(../images/ico_note.png); +background: #F2F2F2 url('../images/ico_note.png'); background-repeat: no-repeat; background-position: top left; padding:5px; @@ -97,7 +89,7 @@ margin:5px; } .attention,.caution,.danger,.important,.remember,.restriction{ -background: #F2F2F2 url(../images/ico_note_attention.png); +background: #F2F2F2 url('../images/ico_note_attention.png'); background-repeat:no-repeat; background-position:top left; padding:5px; @@ -108,51 +100,6 @@ color:#666666; margin:5px; } -/* -------------------------------- -Top navigation -------------------------------- -*/ - -.nav{ -text-align:right; -margin-right:9px; -} -.nav img{ - box-shadow: none; -} -.nav-main{ -margin-top:22px; -margin-left: 20px; -text-align:left -} -.nav-main-content{ -margin-right: 20px; -display:inline-block; -} -.nav-subtitle{ -margin-left: 220px; -} - -header{ -background: none repeat scroll 0% 0% rgb(255,255,255); -border-radius: 10px 10px 10px 10px; -padding: 10px; -box-shadow: 0px 0px 10px rgba(0,0,0,0.1); -} - -header h1{ -display:block; -line-height: 70px; -font-size: 30px; -margin-left: 223px; -} -header img{ -box-shadow: none; -border: 0; -position: absolute; -left: 30px; -} .qtref{ display: block; top: -76px; @@ -173,7 +120,7 @@ padding-top:4px; .naviNextPrevious > a.prevPage { -background-image:url(../images/btn_prev.png); +background-image:url('../images/btn_prev.png'); background-repeat:no-repeat; background-position:left; padding-left:20px; @@ -182,7 +129,7 @@ padding-left:20px; } .naviNextPrevious > a.nextPage { -background-image:url(../images/btn_next.png); +background-image:url('../images/btn_next.png'); background-repeat:no-repeat; background-position:right; padding-right:20px; @@ -190,93 +137,47 @@ height:20px; margin-left:30px; } -.breadcrumb{ -display: block; -position: relative; -z-index:1; -height:20px; -padding:0px; -margin:0px; -padding-left:10px; -padding-top:12px; -margin-left:-5px; -margin-right:-5px; -} - -.breadcrumb ul{ - margin:0px; - padding:0px; +.navigationbar { + background-repeat: no-repeat; + height: 33px; + margin: 0px !important; + padding: 0px !important; + border-bottom: 1px solid rgb(209, 209, 209); + background-image: -moz-linear-gradient(center top , rgb(246, 245, 245), rgb(239, 239, 239)); +background-image: -webkit-gradient( linear, left bottom, left top, color-stop(0.0, #efefef), color-stop(0.5, #f6f5f5) ); + border-radius: 10px 10px 0px 0px; } -.breadcrumb ul li{ -list-style-type:none; -padding:0; -margin:0; +.navigationbar ul{ +margin:0px; +padding:8px 0px 15px 15px; height:20px; } -.breadcrumb li{ +.navigationbar li{ +list-style-type:none; float:left; +font-size: 15px; } -.breadcrumb .first { -background:url(../images/home.png); -background-position:left; -background-repeat:no-repeat; -padding-left:20px; -} - - -.breadcrumb li a{ +.navigationbar li a{ display:block; text-decoration:none; -background:url(../images/arrow.png); +background:url('../images/arrow_bc.png'); background-repeat:no-repeat; background-position:right; padding-right:25px; -padding-left:10px; +font-size: inherit; } -.breadcrumb li a:hover{ -color:#909090; -display:block; -text-decoration:none; -background:url(../images/arrow.png); -background-repeat:no-repeat; -background-position:right; -padding-right:20px; -padding-left:10px; -} -/* ------------ -footer and license ------------ -*/ -.footer{ -text-align:center -} -/* ------------ -main content ------------ -*/ -.line{ -text-align: left; -background: none repeat scroll 0% 0% rgb(255,255,255); -border-radius: 10px 10px 10px 10px; -padding-left: 14px; -padding-right: 14px; -box-shadow: 0px 0px 10px rgba(0,0,0,0.1); -margin-top: 10px; -padding-bottom: 35px; +#buildversion{ +font-style: italic; +font-size: small; +float: right; +margin-right: 5px; } - -/* table of content -no display -*/ - /* ----------- headers @@ -360,7 +261,6 @@ color:#808080; @media print { .title { color:#0066CB; -font-family:Arial, Helvetica; font-size: 32px; font-weight: normal; left: 0; @@ -509,14 +409,6 @@ overflow: auto; padding: 20px 20px 20px 20px; } -.footer{ -margin-top: 50px; -padding-left:5px; -margin-bottom: 10px; -font-size:10px; -border-top: 1px solid #999; -padding-top:11px; -} .footerNavi{ width:auto; @@ -574,7 +466,7 @@ clear: right; padding-bottom: 10px; padding-top: 50px; width: 100%; -background-image:url(../images/bgrContent.png); +background-image:url('../images/bgrContent.png'); background-position:top; background-repeat:no-repeat; } @@ -591,7 +483,7 @@ vertical-align:top; -moz-border-radius: 7px 7px 7px 7px; -webkit-border-radius: 7px 7px 7px 7px; border-radius: 7px 7px 7px 7px; - background:#FFF url(../images/bgrContent.png); + background:#FFF url('../images/bgrContent.png'); background-position:top; background-repeat:repeat-x; border: 1px solid #E6E6E6; @@ -625,7 +517,7 @@ padding-top:10px; .toc ul li{ margin-left:15px; -list-style-image:url(../images/blu_dot.png); +list-style-image:url('../images/blu_dot.png'); list-style:outside; marker-offset: 0px; margin-bottom:8px; @@ -765,3 +657,214 @@ Landing page .sectionlist { width: 100% !important; } + + +/* +Additions from Qt Project +*/ + +body{ +background:#E8E8E8; +margin: 0px; +font-family:"Open Sans",sans-serif !important +} + +.qt13a-twoCol{width:23.46939%;float:left;margin-right:2.04082%;display:inline} + +.qt13a-fourCol{width:48.97959%;float:left;margin-right:2.04082%;display:inline} + +.qt13a-sixCol{ + width:70.4898%; + float:left; + margin-right:2.04082%; + display:inline +} +.qt13a-eightCol{ + width:100%; + float:left; + margin-right:2.04082%; + display:inline +} +.qt13a-fiveCol{width:17.35537%;float:left;margin-right:3.30579%;display:inline} +.qt13a-fiveCol:nth-child(2n){float:left;margin-right:3.30579%} +.qt13a-omega{float:right;margin-right:0;*margin-left:-20px;display:inline} +.qt13a-last{float:right;margin-right:0;*margin-left:-20px;display:inline} +.qt13a-container{*zoom:1;padding-left:20px;padding-right:20px;margin-left:auto;margin-right:auto;max-width:1045px} +.qt13a-container:after{content:"";display:table;clear:both} +.qt13a-container.qt13a-dynamic{max-width:1295px} +.qt13a-no-bg-img{background-image:none !important} +.qt13a-wrapper{overflow:hidden} +.content-view{position:relative;overflow:hidden;} + +#qt13a-header{background:url('../images/Qt-header-bg.jpg') repeat;min-height:126px;padding:0;margin:0;min-width:1045px;margin-bottom:18px} +#qt13a-header .qt13a-gradient{background:url('../images/Qt-gradient.png') repeat-x;background-position:bottom;margin:0;min-height:126px;padding:0} +#qt13a-header #qt13a-title_nav{padding-top:34px;width:87.37374%;float:left;margin-right:1.0101%;display:inline;float:right;margin-right:0;*margin-left:-20px;display:inline} +#qt13a-header #qt13a-title{padding:0px 0 0 0px;padding-bottom:0px} +#qt13a-header p.qt13a-title{ + font-size:24px; + margin:0 0 0 0px; + letter-spacing:-1px; + color:#35322f; + font-weight: 600 +} +#qt13a-header p.qt13a-title a{font-weight:600;color:#35322f} +#qt13a-header p.qt13a-title a:hover{color:#35322f;text-decoration:none} +#qt13a-header #qt13a-logo{float:left;width:11.61616%;float:left;margin-right:1.0101%;display:inline;margin:20px 0px 10px 0;min-width:50px} +#qt13a-header #qt13a-logo img{ + float:left; + border: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +#qt13a-header #qt13a-logo .qt13a-site-logo{ + background: url('../images/Qt-logo.png') no-repeat; + text-indent:-100em; + overflow:hidden; + display:block; + height:90px; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + +#qt13a-header .qt13a-nav{ + background:none +} + +#qt13a-header .qt13a-nav ul{ + margin:0 0 0 0px; + padding:11px 0 0; + background:none +} +#qt13a-header .qt13a-nav .qt13a-nav-small a{font-size:13px} +#qt13a-header .qt13a-nav ul li{display:inline-block;width:auto;padding:0 2.88% 0 0;margin:0;border:0;*display:inline;zoom:1} +#qt13a-header .qt13a-nav ul li.devnet-active a{color:#fff} + +#qt13a-header .qt13a-nav ul li a{ + color:#35322f; + margin:0; + padding:0; + line-height:18px; + font-size:18px +} +#qt13a-header .qt13a-nav ul li a:hover,#qt13a-header .qt13a-nav ul li a:active,#qt13a-header .qt13a-nav ul li a.active{ + color:#fff; + text-decoration:none +} +#qt13a-header .qt13a-nav .qt13a-nav-divider-left{ + border-left:1px solid #35322f; + padding-left:20px +} +#qt13a-header .qt13a-nav-divider-left{ + border-left:1px solid #35322f; + padding-left:10px; + margin-left:5px; + font-size: 13px +} +#qt13a-register_search{ + display:block; + font-variant:400; + float:right +} +#qt13a-register{ + padding:34px 0px 0; + float:right; + text-align:right; + color:#1e1b18; +} +#qt13a-register a{ + color:#1e1b18; + font-weight:400; + font-size:13px; + padding-left:13px +} +#qt13a-register a:visited{color:#1e1b18} +#qt13a-register a:hover{color:#fff;text-decoration:none} +#qt13a-register .qt13a-link-divider{padding:0 5px} +#search{margin-top:23px} +#qt13a-footer{background: url('../images/Qt-header-bg.jpg') repeat;margin:0} +#qt13a-footer .qt13a-last{float:right;margin-right:0;*margin-left:-20px;display:inline} +#qt13a-footer .qt13a-container{padding:36px 0} +#qt13a-footer .qt13a-gradient{background: url('../images/Qt-dark_gradient.png') repeat-x;background-position:bottom;margin:0;min-height:126px;padding:0} +#qt13a-footer .qt13a-shadow{background:transparent url('../images/Qt-footer_shadow.png') repeat-x top center} +#qt13a-footer .qt13a-title a,#qt13a-footer .qt13a-title{padding:18px 0 18px;font-weight:400;letter-spacing:-0.5pt;color:#35322f;font-size:18px;margin:0} +#qt13a-footer ul{width:17.35537%;float:left;margin-right:3.30579%;display:inline;padding-left:0;list-style-type:none} +#qt13a-footer ul li a{font-family:"Open Sans",sans-serif;font-size:13px;color:#35322f;padding:0;font-weight:400} +#qt13a-footer ul li a:hover,#qt13a-footer ul li a:active{color:#35322f;text-decoration:underline} +#qt13a-footer ul li a.qt13a-some-icon{width:32px;height:32px;background-repeat:none;text-indent:-300em;overflow:hidden;display:-moz-inline-stack;display:inline-block;vertical-align:middle;*vertical-align:auto;zoom:1;*display:inline} +.qt13a-copyright{ + border-top:1px solid #000; + background: url('../images/Qt-footer-bg.jpg') repeat; + margin:0; + padding:36px 0; + font-weight:400; + font-size:0.84615em; + line-height:1.63636em} +.qt13a-copyright p{padding:0;color:#aeadac;font-size:11px} +.qt13a-copyright a{color:#328930} +.qt13a-copyright a:visited{color:#328930} + + +.searchbox +{ + display: block; + overflow: hidden; + padding: 0px 35px 0 5px; +} + + +.content-view +{ + position:relative; + overflow:hidden; +} + + +p, li, +p.forum-overview-title, +p.forum-description, +p.desc, +p.forum-lastpost, +div.navigationbars li, +div.block-profile div +{ + font-size: 13px; +} + +p.forum-description.desc +{ + font-size: 13px !important; +} + +.steps li +{ + font-size: 16px; +} + +div.license p, +div.notes p +{ + font-size: 12px !important; +} + +a { +color: #44a51c; +text-decoration: none; +} +.wrap{ +padding-left: 30px +} + +.main { + padding: 0px 30px 30px 30px; +} +.main-rounded { + display: inline-block; + background: none repeat scroll 0% 0% rgb(255,255,255); + width: 100%; + border: 1px solid #DADADA; + border-radius: 10px 10px 10px 10px; + box-shadow: 0 0 3px #C4C4C4; + padding-bottom: 30px; +} |
