Skip to content

Commit fc28712

Browse files
vkrausevkrause
committed
Merge remote-tracking branch 'github/2.7'
2 parents 7ee4788 + 25a1814 commit fc28712

23 files changed

Lines changed: 1506 additions & 425 deletions

‎docs/manual/CMakeLists.txt‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ macro(qt5_build_doc _qdocconf_name)
1010
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}.qdocconf)
1111
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}-offline.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-offline.qdocconf)
1212
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}-online.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online.qdocconf)
13+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_qdocconf_name}-online-kdab.qdocconf.in ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab.qdocconf)
1314

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

4041
# online docs
41-
set(_qdoc_output_dir ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online)
4242
file(GLOB _qdoc_styles ${CMAKE_CURRENT_SOURCE_DIR} "style/*")
43+
# Qt style
44+
set(_qdoc_output_dir ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online)
4345
add_custom_command(
4446
OUTPUT ${_qdoc_output_dir}/index.html
4547
COMMAND ${QDOC_EXECUTABLE}
@@ -49,6 +51,17 @@ macro(qt5_build_doc _qdocconf_name)
4951
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online.qdocconf ${_qdoc_srcs} ${_qdoc_imgs} ${_qdoc_styles}
5052
)
5153
add_custom_target(online-docs DEPENDS ${_qdoc_output_dir}/index.html)
54+
# KDAB style
55+
set(_qdoc_output_dir ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab)
56+
add_custom_command(
57+
OUTPUT ${_qdoc_output_dir}/index.html
58+
COMMAND ${QDOC_EXECUTABLE}
59+
--indexdir ${QDOC_INDEX_DIR}
60+
--outputdir ${_qdoc_output_dir}
61+
${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab.qdocconf
62+
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_qdocconf_name}-online-kdab.qdocconf ${_qdoc_srcs} ${_qdoc_imgs} ${_qdoc_styles}
63+
)
64+
add_custom_target(online-docs-kdab DEPENDS ${_qdoc_output_dir}/index.html)
5265

5366
endmacro()
5467

‎docs/manual/gammaray-manual-online-kdab.qdocconf.in‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
include(@CMAKE_CURRENT_BINARY_DIR@/gammaray-manual.qdocconf)
2+
3+
HTML.stylesheets += \
4+
@CMAKE_CURRENT_SOURCE_DIR@/style/qt5-sidebar.html \
5+
@CMAKE_CURRENT_SOURCE_DIR@/style/kdab-header.html \
6+
@CMAKE_CURRENT_SOURCE_DIR@/style/kdab-footer.html \
7+
@CMAKE_CURRENT_SOURCE_DIR@/style/kdab-online.css \
8+
@CMAKE_CURRENT_SOURCE_DIR@/style/gammaray-manual-splash-screen.png \
9+
@CMAKE_CURRENT_SOURCE_DIR@/style/gammaray-logo-256.png \
10+
11+
HTML.headerstyles = \
12+
" <link rel=\"stylesheet\" href=\"https://www.kdab.com/wp-content/themes/kdab16/css/bootstrap-3.3.6.min.css\" type=\"text/css\"/>\n" \
13+
" <link rel=\"stylesheet\" href=\"https://www.kdab.com/wp-content/themes/kdab16/css/font-awesome-4.5.0.min.css\" type=\"text/css\"/>\n" \
14+
" <link rel=\"stylesheet\" href=\"https://www.kdab.com/wp-content/themes/kdab16/style.css\" type=\"text/css\"/>\n" \
15+
" <link rel=\"stylesheet\" href=\"style/kdab-online.css\" type=\"text/css\"/>\n" \
16+
" <link rel=\"icon\" href=\"https://www.kdab.com/wp-content/uploads/stories/cropped-Favicon-32x32.png\" sizes=\"32x32\"/>\n"
17+
18+
HTML.headerscripts = \
19+
" <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" \
20+
" <script type=\"text/javascript\" src=\"https://www.kdab.com/wp-content/themes/kdab16/js/modernizr.custom.js?ver=2.6.2\"></script>\n" \
21+
" <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" \
22+
" <script type=\"text/javascript\">\n" \
23+
" \$(function(){\n" \
24+
" \$(\"#kdab-header\").load(\"style/kdab-header.html\", function() {\n" \
25+
" \$('.navbar .dropdown > a').click(function () {\n" \
26+
" location.href = this.href;\n" \
27+
" });\n" \
28+
" \$('.navbar .dropdown').hover(function () {\n" \
29+
" \$(this).addClass(\"open\");\n" \
30+
" }, function () { \n" \
31+
" \$(this).removeClass(\"open\");\n" \
32+
" });\n" \
33+
" });\n" \
34+
" \$(\"#kdab-footer\").load(\"style/kdab-footer.html\");\n" \
35+
" \$(\"#sidebar-content\").load(\"style/qt5-sidebar.html\");\n" \
36+
" if (\$(\"#sidebar-content\").length == 0) { \$(\"#content\").prepend(\"<img src='style/gammaray-manual-splash-screen.png' id='splashscreen'/>\"); }\n" \
37+
" });\n" \
38+
" </script>\n" \
39+
40+
HTML.endheader = \
41+
"</head>\n"
42+
43+
# this goes before the breadcrumb
44+
HTML.postheader = \
45+
"<body>\n" \
46+
" <div id=\"sb-site\" style=\"min-height: 1106px;\">\n" \
47+
" <div data-spy=\"affix\" data-offset-top=\"1\" class=\"affixautowidth mainnav affix\" id=\"kdab-header\"></div>\n" \
48+
" <div class=\"mainbgcol\">\n" \
49+
" <nav class=\"expertise\"><div class=\"container\"><div class=\"row\">\n" \
50+
" <div class=\"col-xs-4\"><a href=\"https://www.kdab.com/expertise/qt/\" class=\"expert-qt\">Qt / QML</a></div>\n" \
51+
" <div class=\"col-xs-4\"><a href=\"https://www.kdab.com/expertise/cpp/\" class=\"expert-c\">C++</a></div>\n" \
52+
" <div class=\"col-xs-4\"><a href=\"https://www.kdab.com/expertise/3dgraphicsandcompute/\" class=\"expert-opengl\">3D / OpenGL</a></div>\n" \
53+
" </div></div></nav>\n" \
54+
" <nav class=\"breadcrumbHolder\">\n" \
55+
" <div class=\"container\">\n" \
56+
" <ul>\n" \
57+
58+
# this goes between breadcrumb and sidebar
59+
HTML.postpostheader = \
60+
"</ul></div></nav>\n" \
61+
"<div class=\"container\">\n" \
62+
"<div class=\"row\">\n"
63+
64+
# this goes between sidebar and actual content
65+
HTML.prologue = \
66+
" <div class=\"content\" id=\"content\">\n" \
67+
68+
HTML.footer += \
69+
"</div>\n" \
70+
"</div>\n" \
71+
"</div>\n" \
72+
"</div>\n" \
73+
"</div>\n" \
74+
"<div id=\"kdab-footer\">\n" \
75+
"<footer id=\"#footer\">\n" \
76+
"</footer>\n" \
77+
"</div>\n"

‎docs/manual/style/gammaray-logo-256.png‎

53 KB
Loading

‎docs/manual/style/gammaray-manual-splash-screen.png‎

337 KB
Loading

‎docs/manual/style/kdab-footer.html‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<nav class="expertise">
2+
<div class="container">
3+
<div class="row">
4+
<div class="col-xs-4"><a href="https://www.kdab.com/expertise/qt/" class="expert-qt">Qt / QML</a></div>
5+
<div class="col-xs-4"><a href="https://www.kdab.com/expertise/c/" class="expert-c">C++</a></div>
6+
<div class="col-xs-4"><a href="https://www.kdab.com/expertise/3dgraphicsandcompute/" class="expert-opengl">3D / OpenGL</a></div>
7+
</div>
8+
</div>
9+
</nav>
10+
<footer class="sitefooter">
11+
<div class="container">
12+
<div class="row">
13+
<div class="col-sm-3">
14+
<div class="the_bubble">
15+
<i class="fa kdab-logo" aria-hidden="true"></i>
16+
<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>
17+
</div>
18+
<h4>Contact us</h4>
19+
<p class="p9">
20+
DE: <a href="tel:+49 30 5213 254 70" class="tel">+49 30 5213 254 70</a><br/>
21+
US: <a href="tel:+1.866.777.5322" class="tel">+1.866.777.5322</a><br/>
22+
FR: <a href="tel:+33 4 90 84 08 53" class="tel">+33 4 90 84 08 53</a><br/>
23+
UK: <a href="tel:+44 1625 809908" class="tel">+44 1625 809908</a><br/>
24+
<a href="https://www.kdab.com/about/contact/">Full list, all countries</a>
25+
</p>
26+
27+
<ul class="soc">
28+
<li><a class="soc-facebook square white" href="http://www.facebook.com/kdabqt" target="_blank"></a></li>
29+
<li><a class="soc-googleplus square white" href="https://plus.google.com/u/0/105483413239517674252/posts" target="_blank"></a></li>
30+
<li><a class="soc-twitter square white soc-icon-last" href="http://www.twitter.com/kdabqt" target="_blank"></a></li>
31+
</ul>
32+
</div>
33+
<div class="col-sm-9">
34+
<div class="row">
35+
<div class="col-sm-3 hidden-xs">
36+
<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>
37+
<ul class="dropdown-menu">
38+
<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>
39+
<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>
40+
<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>
41+
<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>
42+
<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>
43+
<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>
44+
<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>
45+
<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>
46+
</ul>
47+
</li></ul>
48+
</div>
49+
<div class="col-sm-9 hidden-xs">
50+
<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>
51+
<ul class="dropdown-menu">
52+
<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>
53+
<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>
54+
<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>
55+
<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>
56+
<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>
57+
<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>
58+
</ul>
59+
</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>
60+
<ul class="dropdown-menu">
61+
<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>
62+
<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>
63+
<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>
64+
</ul>
65+
</li>
66+
<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>
67+
<ul class="dropdown-menu">
68+
<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>
69+
<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>
70+
<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>
71+
<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>
72+
<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>
73+
<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>
74+
<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>
75+
<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>
76+
<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>
77+
</ul>
78+
</li>
79+
<!-- Resources column -->
80+
<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>
81+
<ul class="dropdown-menu">
82+
<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>
83+
<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>
84+
<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>
85+
<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>
86+
<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>
87+
<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>
88+
<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>
89+
<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>
90+
<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>
91+
<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>
92+
</ul>
93+
</li></ul>
94+
</div>
95+
<div class="col-sm-12"> </div>
96+
</div>
97+
</div>
98+
</div>
99+
</div>
100+
</footer>

0 commit comments

Comments
 (0)