Commit 9d38dbde authored by Jani Heikkinen's avatar Jani Heikkinen Committed by The Qt Project
Browse files

Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into refs/staging/5.4.0

parents 9b7bdd45 0d02a065
No related merge requests found
Showing with 12 additions and 1 deletion
...@@ -483,3 +483,15 @@ ...@@ -483,3 +483,15 @@
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html \externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html
\title Qt Creator: Connecting Windows Runtime Devices \title Qt Creator: Connecting Windows Runtime Devices
*/ */
/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-clang-codemodel.html
\title Qt Creator: Parsing C++ Files
*/
/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-quick-ui-forms.html
\title Qt Creator: Qt Quick UI Forms
*/
/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-clang-static-analyzer.html
\title Qt Creator: Using Clang Static Analyzer
*/
doc/global/template/images/Qt-logo.png

4.24 KiB | W: | H:

doc/global/template/images/Qt-logo.png

2.37 KiB | W: | H:

doc/global/template/images/Qt-logo.png
doc/global/template/images/Qt-logo.png
doc/global/template/images/Qt-logo.png
doc/global/template/images/Qt-logo.png
  • 2-up
  • Swipe
  • Onion skin
doc/global/template/images/logo.png

2.15 KiB | W: | H:

doc/global/template/images/logo.png

2.31 KiB | W: | H:

doc/global/template/images/logo.png
doc/global/template/images/logo.png
doc/global/template/images/logo.png
doc/global/template/images/logo.png
  • 2-up
  • Swipe
  • Onion skin
doc/global/template/images/sprites-combined.png

61.1 KiB | W: | H:

doc/global/template/images/sprites-combined.png

52.7 KiB | W: | H:

doc/global/template/images/sprites-combined.png
doc/global/template/images/sprites-combined.png
doc/global/template/images/sprites-combined.png
doc/global/template/images/sprites-combined.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -2,7 +2,6 @@ body { ...@@ -2,7 +2,6 @@ body {
font: normal 400 14px/1.2 Arial; font: normal 400 14px/1.2 Arial;
margin-top: 85px; margin-top: 85px;
font-family: Arial, Helvetica; font-family: Arial, Helvetica;
color: #313131;
text-align: left; text-align: left;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
......
examples/opengl/legacy/framebufferobject2/cubelogo.png

5.78 KiB | W: | H:

examples/opengl/legacy/framebufferobject2/cubelogo.png

2.82 KiB | W: | H:

examples/opengl/legacy/framebufferobject2/cubelogo.png
examples/opengl/legacy/framebufferobject2/cubelogo.png
examples/opengl/legacy/framebufferobject2/cubelogo.png
examples/opengl/legacy/framebufferobject2/cubelogo.png
  • 2-up
  • Swipe
  • Onion skin
examples/opengl/legacy/pbuffers/cubelogo.png

5.78 KiB | W: | H:

examples/opengl/legacy/pbuffers/cubelogo.png

2.82 KiB | W: | H:

examples/opengl/legacy/pbuffers/cubelogo.png
examples/opengl/legacy/pbuffers/cubelogo.png
examples/opengl/legacy/pbuffers/cubelogo.png
examples/opengl/legacy/pbuffers/cubelogo.png
  • 2-up
  • Swipe
  • Onion skin
examples/sql/doc/images/drilldown-example.png

51.7 KiB | W: | H:

examples/sql/doc/images/drilldown-example.png

8.88 KiB | W: | H:

examples/sql/doc/images/drilldown-example.png
examples/sql/doc/images/drilldown-example.png
examples/sql/doc/images/drilldown-example.png
examples/sql/doc/images/drilldown-example.png
  • 2-up
  • Swipe
  • Onion skin
examples/sql/drilldown/images/qt-creator.png

45.8 KiB | W: | H:

examples/sql/drilldown/images/qt-creator.png

6.5 KiB | W: | H:

examples/sql/drilldown/images/qt-creator.png
examples/sql/drilldown/images/qt-creator.png
examples/sql/drilldown/images/qt-creator.png
examples/sql/drilldown/images/qt-creator.png
  • 2-up
  • Swipe
  • Onion skin
examples/sql/drilldown/images/qt-logo.png

44.6 KiB | W: | H:

examples/sql/drilldown/images/qt-logo.png

5.4 KiB | W: | H:

examples/sql/drilldown/images/qt-logo.png
examples/sql/drilldown/images/qt-logo.png
examples/sql/drilldown/images/qt-logo.png
examples/sql/drilldown/images/qt-logo.png
  • 2-up
  • Swipe
  • Onion skin
examples/sql/drilldown/images/qt-project.png

36.9 KiB | W: | H:

examples/sql/drilldown/images/qt-project.png

16.4 KiB | W: | H:

examples/sql/drilldown/images/qt-project.png
examples/sql/drilldown/images/qt-project.png
examples/sql/drilldown/images/qt-project.png
examples/sql/drilldown/images/qt-project.png
  • 2-up
  • Swipe
  • Onion skin
examples/sql/drilldown/images/qt-quick.png

42.2 KiB | W: | H:

examples/sql/drilldown/images/qt-quick.png

26 KiB | W: | H:

examples/sql/drilldown/images/qt-quick.png
examples/sql/drilldown/images/qt-quick.png
examples/sql/drilldown/images/qt-quick.png
examples/sql/drilldown/images/qt-quick.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/animation/animatedtiles/images/kinetic.png

6.62 KiB | W: | H:

examples/widgets/animation/animatedtiles/images/kinetic.png

4.94 KiB | W: | H:

examples/widgets/animation/animatedtiles/images/kinetic.png
examples/widgets/animation/animatedtiles/images/kinetic.png
examples/widgets/animation/animatedtiles/images/kinetic.png
examples/widgets/animation/animatedtiles/images/kinetic.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/animation/easing/images/qt-logo.png

5.03 KiB | W: | H:

examples/widgets/animation/easing/images/qt-logo.png

1.46 KiB | W: | H:

examples/widgets/animation/easing/images/qt-logo.png
examples/widgets/animation/easing/images/qt-logo.png
examples/widgets/animation/easing/images/qt-logo.png
examples/widgets/animation/easing/images/qt-logo.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/doc/images/dropsite-example.png

35.2 KiB | W: | H:

examples/widgets/doc/images/dropsite-example.png

28.4 KiB | W: | H:

examples/widgets/doc/images/dropsite-example.png
examples/widgets/doc/images/dropsite-example.png
examples/widgets/doc/images/dropsite-example.png
examples/widgets/doc/images/dropsite-example.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/doc/images/icons_qt_extended_16x16.png

1.16 KiB | W: | H:

examples/widgets/doc/images/icons_qt_extended_16x16.png

563 B | W: | H:

examples/widgets/doc/images/icons_qt_extended_16x16.png
examples/widgets/doc/images/icons_qt_extended_16x16.png
examples/widgets/doc/images/icons_qt_extended_16x16.png
examples/widgets/doc/images/icons_qt_extended_16x16.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/doc/images/icons_qt_extended_17x17.png

1.19 KiB | W: | H:

examples/widgets/doc/images/icons_qt_extended_17x17.png

605 B | W: | H:

examples/widgets/doc/images/icons_qt_extended_17x17.png
examples/widgets/doc/images/icons_qt_extended_17x17.png
examples/widgets/doc/images/icons_qt_extended_17x17.png
examples/widgets/doc/images/icons_qt_extended_17x17.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/doc/images/icons_qt_extended_32x32.png

2.13 KiB | W: | H:

examples/widgets/doc/images/icons_qt_extended_32x32.png

916 B | W: | H:

examples/widgets/doc/images/icons_qt_extended_32x32.png
examples/widgets/doc/images/icons_qt_extended_32x32.png
examples/widgets/doc/images/icons_qt_extended_32x32.png
examples/widgets/doc/images/icons_qt_extended_32x32.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/doc/images/icons_qt_extended_33x33.png

2.38 KiB | W: | H:

examples/widgets/doc/images/icons_qt_extended_33x33.png

975 B | W: | H:

examples/widgets/doc/images/icons_qt_extended_33x33.png
examples/widgets/doc/images/icons_qt_extended_33x33.png
examples/widgets/doc/images/icons_qt_extended_33x33.png
examples/widgets/doc/images/icons_qt_extended_33x33.png
  • 2-up
  • Swipe
  • Onion skin
examples/widgets/doc/images/icons_qt_extended_48x48.png

3.72 KiB | W: | H:

examples/widgets/doc/images/icons_qt_extended_48x48.png

1.24 KiB | W: | H:

examples/widgets/doc/images/icons_qt_extended_48x48.png
examples/widgets/doc/images/icons_qt_extended_48x48.png
examples/widgets/doc/images/icons_qt_extended_48x48.png
examples/widgets/doc/images/icons_qt_extended_48x48.png
  • 2-up
  • Swipe
  • Onion skin
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment