Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/2.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vkrause
vkrause committed Feb 6, 2017
2 parents 7ee4788 + 25a1814 commit fc28712
Show file tree
Hide file tree
Showing 23 changed files with 1,506 additions and 425 deletions.
15 changes: 14 additions & 1 deletion docs/manual/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ macro(qt5_build_doc _qdocconf_name)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}.qdocconf)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}-offline.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-offline.qdocconf)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}-online.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online.qdocconf)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}-online-kdab.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab.qdocconf)

# offline docs
# run qdoc to get qhp file
Expand Down Expand Up @@ -38,8 +39,9 @@ macro(qt5_build_doc _qdocconf_name)
install(FILES ${_qdoc_output_dir}/${_qdocconf_name}.qch DESTINATION ${QCH_INSTALL_DIR})

# online docs
set(_qdoc_output_dir ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online)
file(GLOB _qdoc_styles ${CMAKE_CURRENT_SOURCE_DIR} "style/*")
# Qt style
set(_qdoc_output_dir ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online)
add_custom_command(
OUTPUT ${_qdoc_output_dir}/index.html
COMMAND ${QDOC_EXECUTABLE}
Expand All @@ -49,6 +51,17 @@ macro(qt5_build_doc _qdocconf_name)
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online.qdocconf ${_qdoc_srcs} ${_qdoc_imgs} ${_qdoc_styles}
)
add_custom_target(online-docs DEPENDS ${_qdoc_output_dir}/index.html)
# KDAB style
set(_qdoc_output_dir ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab)
add_custom_command(
OUTPUT ${_qdoc_output_dir}/index.html
COMMAND ${QDOC_EXECUTABLE}
--indexdir ${QDOC_INDEX_DIR}
--outputdir ${_qdoc_output_dir}
${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab.qdocconf
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab.qdocconf ${_qdoc_srcs} ${_qdoc_imgs} ${_qdoc_styles}
)
add_custom_target(online-docs-kdab DEPENDS ${_qdoc_output_dir}/index.html)

endmacro()

Expand Down
77 changes: 77 additions & 0 deletions docs/manual/gammaray-manual-online-kdab.qdocconf.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
include(@CMAKE_CURRENT_BINARY_DIR@/gammaray-manual.qdocconf)

HTML.stylesheets += \
@CMAKE_CURRENT_SOURCE_DIR@/style/qt5-sidebar.html \
@CMAKE_CURRENT_SOURCE_DIR@/style/kdab-header.html \
@CMAKE_CURRENT_SOURCE_DIR@/style/kdab-footer.html \
@CMAKE_CURRENT_SOURCE_DIR@/style/kdab-online.css \
@CMAKE_CURRENT_SOURCE_DIR@/style/gammaray-manual-splash-screen.png \
@CMAKE_CURRENT_SOURCE_DIR@/style/gammaray-logo-256.png \

HTML.headerstyles = \
" <link rel=\"stylesheet\" href=\"https://www.kdab.com/wp-content/themes/kdab16/css/bootstrap-3.3.6.min.css\" type=\"text/css\"/>\n" \
" <link rel=\"stylesheet\" href=\"https://www.kdab.com/wp-content/themes/kdab16/css/font-awesome-4.5.0.min.css\" type=\"text/css\"/>\n" \
" <link rel=\"stylesheet\" href=\"https://www.kdab.com/wp-content/themes/kdab16/style.css\" type=\"text/css\"/>\n" \
" <link rel=\"stylesheet\" href=\"style/kdab-online.css\" type=\"text/css\"/>\n" \
" <link rel=\"icon\" href=\"https://www.kdab.com/wp-content/uploads/stories/cropped-Favicon-32x32.png\" sizes=\"32x32\"/>\n"

HTML.headerscripts = \
" <script type=\"text/javascript\" src=\"https://www.kdab.com/wp-content/themes/kdab16/js/jquery-2.2.3.min.js?ver=2.2.3\"></script>\n" \
" <script type=\"text/javascript\" src=\"https://www.kdab.com/wp-content/themes/kdab16/js/modernizr.custom.js?ver=2.6.2\"></script>\n" \
" <script type=\"text/javascript\" src=\"https://www.kdab.com/wp-content/themes/kdab16/js/bootstrap-3.3.6.min.js?ver=3.3.6\"></script>\n" \
" <script type=\"text/javascript\">\n" \
" \$(function(){\n" \
" \$(\"#kdab-header\").load(\"style/kdab-header.html\", function() {\n" \
" \$('.navbar .dropdown > a').click(function () {\n" \
" location.href = this.href;\n" \
" });\n" \
" \$('.navbar .dropdown').hover(function () {\n" \
" \$(this).addClass(\"open\");\n" \
" }, function () { \n" \
" \$(this).removeClass(\"open\");\n" \
" });\n" \
" });\n" \
" \$(\"#kdab-footer\").load(\"style/kdab-footer.html\");\n" \
" \$(\"#sidebar-content\").load(\"style/qt5-sidebar.html\");\n" \
" if (\$(\"#sidebar-content\").length == 0) { \$(\"#content\").prepend(\"<img src='style/gammaray-manual-splash-screen.png' id='splashscreen'/>\"); }\n" \
" });\n" \
" </script>\n" \

HTML.endheader = \
"</head>\n"

# this goes before the breadcrumb
HTML.postheader = \
"<body>\n" \
" <div id=\"sb-site\" style=\"min-height: 1106px;\">\n" \
" <div data-spy=\"affix\" data-offset-top=\"1\" class=\"affixautowidth mainnav affix\" id=\"kdab-header\"></div>\n" \
" <div class=\"mainbgcol\">\n" \
" <nav class=\"expertise\"><div class=\"container\"><div class=\"row\">\n" \
" <div class=\"col-xs-4\"><a href=\"https://www.kdab.com/expertise/qt/\" class=\"expert-qt\">Qt / QML</a></div>\n" \
" <div class=\"col-xs-4\"><a href=\"https://www.kdab.com/expertise/cpp/\" class=\"expert-c\">C++</a></div>\n" \
" <div class=\"col-xs-4\"><a href=\"https://www.kdab.com/expertise/3dgraphicsandcompute/\" class=\"expert-opengl\">3D / OpenGL</a></div>\n" \
" </div></div></nav>\n" \
" <nav class=\"breadcrumbHolder\">\n" \
" <div class=\"container\">\n" \
" <ul>\n" \

# this goes between breadcrumb and sidebar
HTML.postpostheader = \
"</ul></div></nav>\n" \
"<div class=\"container\">\n" \
"<div class=\"row\">\n"

# this goes between sidebar and actual content
HTML.prologue = \
" <div class=\"content\" id=\"content\">\n" \

HTML.footer += \
"</div>\n" \
"</div>\n" \
"</div>\n" \
"</div>\n" \
"</div>\n" \
"<div id=\"kdab-footer\">\n" \
"<footer id=\"#footer\">\n" \
"</footer>\n" \
"</div>\n"
Binary file added docs/manual/style/gammaray-logo-256.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/manual/style/gammaray-manual-splash-screen.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
100 changes: 100 additions & 0 deletions docs/manual/style/kdab-footer.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<nav class="expertise">
<div class="container">
<div class="row">
<div class="col-xs-4"><a href="https://www.kdab.com/expertise/qt/" class="expert-qt">Qt / QML</a></div>
<div class="col-xs-4"><a href="https://www.kdab.com/expertise/c/" class="expert-c">C++</a></div>
<div class="col-xs-4"><a href="https://www.kdab.com/expertise/3dgraphicsandcompute/" class="expert-opengl">3D / OpenGL</a></div>
</div>
</div>
</nav>
<footer class="sitefooter">
<div class="container">
<div class="row">
<div class="col-sm-3">
<div class="the_bubble">
<i class="fa kdab-logo" aria-hidden="true"></i>
<p class="p9">The KDAB Group is the global No.1 software consultancy for Qt, C++ and OpenGL applications across desktop, embedded and mobile platforms</p>
</div>
<h4>Contact us</h4>
<p class="p9">
DE: <a href="tel:+49 30 5213 254 70" class="tel">+49 30 5213 254 70</a><br/>
US: <a href="tel:+1.866.777.5322" class="tel">+1.866.777.5322</a><br/>
FR: <a href="tel:+33 4 90 84 08 53" class="tel">+33 4 90 84 08 53</a><br/>
UK: <a href="tel:+44 1625 809908" class="tel">+44 1625 809908</a><br/>
<a href="https://www.kdab.com/about/contact/">Full list, all countries</a>
</p>

<ul class="soc">
<li><a class="soc-facebook square white" href="http://www.facebook.com/kdabqt" target="_blank"></a></li>
<li><a class="soc-googleplus square white" href="https://plus.google.com/u/0/105483413239517674252/posts" target="_blank"></a></li>
<li><a class="soc-twitter square white soc-icon-last" href="http://www.twitter.com/kdabqt" target="_blank"></a></li>
</ul>
</div>
<div class="col-sm-9">
<div class="row">
<div class="col-sm-3 hidden-xs">
<ul id="menu-specialnav-1" class="clearfix fullwidth"><li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10701"><a href="https://www.kdab.com/about/" class="dropdown-toggle" data-toggle="dropdown">About us <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10702"><a href="https://www.kdab.com/about/contact/">Contact</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10703"><a href="https://www.kdab.com/about/customers/">Customers</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10704"><a href="https://www.kdab.com/about/kdab-iso-9000-certified/">ISO 9001 Certified</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10706"><a href="https://www.kdab.com/about/partners/">Partners</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-11950"><a href="https://www.kdab.com/about/kdabs-mission/">Mission</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10705"><a href="https://www.kdab.com/about/careers/">Working at KDAB</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10707"><a href="https://www.kdab.com/about/en-francais/">KDAB France</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-12722"><a href="https://www.kdab.com/about/website-terms-and-conditions/">Terms and Conditions</a></li>
</ul>
</li></ul>
</div>
<div class="col-sm-9 hidden-xs">
<ul id="menu-main-update-1" class="clearfix"><li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10066"><a href="https://www.kdab.com/software-services/" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10091"><a href="https://www.kdab.com/software-services/software-projects/" class="dropdown-toggle" data-toggle="dropdown">Projects <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10089"><a href="https://www.kdab.com/software-services/workshops/" class="dropdown-toggle" data-toggle="dropdown">Workshops <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10099"><a href="https://www.kdab.com/software-services/design/">Design Services</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10110"><a href="https://www.kdab.com/qt-in-automotive/" class="dropdown-toggle" data-toggle="dropdown">Qt Automotive Suite <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10068"><a href="https://www.kdab.com/software-services/on-site-training/" class="dropdown-toggle" data-toggle="dropdown">Training: On-Site <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10076"><a href="https://www.kdab.com/software-services/scheduled-training/" class="dropdown-toggle" data-toggle="dropdown">Training: Scheduled <b class="caret"></b></a></li>
</ul>
</li><li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10101"><a href="https://www.kdab.com/expertise/" class="dropdown-toggle" data-toggle="dropdown">Expertise <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10102"><a href="https://www.kdab.com/expertise/qt/" class="dropdown-toggle" data-toggle="dropdown">Qt / QML <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10111"><a href="https://www.kdab.com/expertise/c/" class="dropdown-toggle" data-toggle="dropdown">C++ <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10114"><a href="https://www.kdab.com/expertise/3dgraphicsandcompute/" class="dropdown-toggle" data-toggle="dropdown">3D / OpenGL <b class="caret"></b></a></li>
</ul>
</li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10120"><a href="https://www.kdab.com/platforms/" class="dropdown-toggle" data-toggle="dropdown">Platforms <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10981"><a href="https://www.kdab.com/platforms/android/">Android</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10126"><a href="https://www.kdab.com/platforms/linux/">Linux</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10127"><a href="https://www.kdab.com/platforms/web/">Web integration</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-11093"><a href="https://www.kdab.com/platforms/qnx-platform/">QNX</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-11094"><a href="https://www.kdab.com/platforms/windows-embedded/">Windows Embedded</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10130"><a href="https://www.kdab.com/platforms/ios/">Mobile iOS/Android</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10122"><a href="https://www.kdab.com/platforms/windows/">Windows</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10125"><a href="https://www.kdab.com/platforms/mac/">macOS</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10131"><a href="https://www.kdab.com/platforms/unixx11-motif/">Unix / X11 (Motif)</a></li>
</ul>
</li>
<!-- Resources column -->
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-10132"><a href="https://www.kdab.com/development-resources/" class="dropdown-toggle" data-toggle="dropdown">Resources <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="menu-item menu-item-type-taxonomy menu-item-object-category menu-item-10133"><a href="https://www.kdab.com/category/blogs/">Blogs</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10136"><a href="https://www.kdab.com/development-resources/videos-webinars/">Videos</a></li>
<li class="menu-item menu-item-type-taxonomy menu-item-object-category menu-item-11643"><a href="https://www.kdab.com/category/whitepapers/">Whitepapers &#038; Articles</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13696"><a href="https://www.kdab.com/development-resources/qtcon-2016/">QtCon 2016</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-12155"><a href="/development-resources/qt-developer-days-2014/" class="dropdown-toggle" data-toggle="dropdown">Qt Developer Days <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children dropdown menu-item-13508"><a href="https://www.kdab.com/development-resources/kdab-qt-world-summit-2016/" class="dropdown-toggle" data-toggle="dropdown">Qt World Summit &#8217;16 <b class="caret"></b></a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10135"><a href="https://www.kdab.com/development-resources/sign-up-for-our-newsletter/">Newsletter</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10134"><a href="https://www.kdab.com/development-resources/kdab-events/">Events</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10883"><a href="https://www.kdab.com/development-resources/qt-tools/">Qt Tools</a></li>
<li class="menu-item menu-item-type-post_type menu-item-object-page menu-item-10142"><a href="https://www.kdab.com/development-resources/qtcreator/">Qt Creator Card</a></li>
</ul>
</li></ul>
</div>
<div class="col-sm-12"> </div>
</div>
</div>
</div>
</div>
</footer>
Loading

0 comments on commit fc28712

Please sign in to comment.