From 197ccb9bda21382a9d26625f34eca45981fdebd6 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 20 May 2020 16:16:05 +0200 Subject: Doc: Resize front page images to remove scrollbar Change-Id: I8555bd5f7952530a02d57be436fc27c8a04de0be Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- doc/qtcreator/images/creator_advanceduse.png | Bin 2751 -> 0 bytes doc/qtcreator/images/creator_buildingrunning.png | Bin 3781 -> 0 bytes doc/qtcreator/images/creator_coding.png | Bin 6324 -> 0 bytes .../images/creator_designinguserinterface.png | Bin 4617 -> 0 bytes doc/qtcreator/images/creator_gettinghelp.png | Bin 2390 -> 0 bytes doc/qtcreator/images/creator_gettingstarted.png | Bin 2343 -> 0 bytes doc/qtcreator/images/creator_managingprojects.png | Bin 3034 -> 0 bytes doc/qtcreator/images/creator_publishing.png | Bin 3716 -> 0 bytes doc/qtcreator/images/creator_testing.png | Bin 3254 -> 0 bytes doc/qtcreator/images/front-advanced.png | Bin 0 -> 1964 bytes doc/qtcreator/images/front-coding.png | Bin 0 -> 6970 bytes doc/qtcreator/images/front-gs.png | Bin 0 -> 1824 bytes doc/qtcreator/images/front-help.png | Bin 0 -> 1685 bytes doc/qtcreator/images/front-preview.png | Bin 0 -> 3359 bytes doc/qtcreator/images/front-projects.png | Bin 0 -> 2741 bytes doc/qtcreator/images/front-publishing.png | Bin 0 -> 3254 bytes doc/qtcreator/images/front-testing.png | Bin 0 -> 2157 bytes doc/qtcreator/images/front-ui.png | Bin 0 -> 3982 bytes doc/qtcreator/src/editors/creator-coding.qdoc | 2 +- .../overview/creator-only/creator-advanced.qdoc | 2 +- .../creator-only/creator-design-overview.qdoc | 2 +- .../creator-only/creator-getting-started.qdoc | 10 ++-- .../creator-only/creator-help-overview.qdoc | 2 +- .../overview/creator-only/creator-overview.qdoc | 12 ++--- .../src/overview/creator-only/creator-testing.qdoc | 2 +- .../overview/creator-only/creator-tutorials.qdoc | 2 +- .../creator-projects-building-running.qdoc | 2 +- .../creator-only/creator-projects-overview.qdoc | 2 +- doc/qtcreator/src/qtcreator.qdoc | 16 +++--- doc/qtdesignstudio/images/studio-3d-scenes.png | Bin 1670 -> 2411 bytes doc/qtdesignstudio/images/studio-animation.png | Bin 6060 -> 4670 bytes doc/qtdesignstudio/images/studio-animation.svg | 57 +++++++++++++++++++++ doc/qtdesignstudio/images/studio-components.png | Bin 3963 -> 0 bytes doc/qtdesignstudio/images/studio-connections.png | Bin 3989 -> 0 bytes doc/qtdesignstudio/images/studio-gs.png | Bin 1852 -> 0 bytes doc/qtdesignstudio/images/studio-help.png | Bin 1577 -> 0 bytes doc/qtdesignstudio/images/studio-preview.png | Bin 3532 -> 0 bytes doc/qtdesignstudio/images/studio-projects.png | Bin 2380 -> 0 bytes doc/qtdesignstudio/images/studio-settings.png | Bin 1945 -> 0 bytes doc/qtdesignstudio/src/qtdesignstudio.qdoc | 12 ++--- 40 files changed, 90 insertions(+), 33 deletions(-) delete mode 100644 doc/qtcreator/images/creator_advanceduse.png delete mode 100644 doc/qtcreator/images/creator_buildingrunning.png delete mode 100644 doc/qtcreator/images/creator_coding.png delete mode 100644 doc/qtcreator/images/creator_designinguserinterface.png delete mode 100644 doc/qtcreator/images/creator_gettinghelp.png delete mode 100644 doc/qtcreator/images/creator_gettingstarted.png delete mode 100644 doc/qtcreator/images/creator_managingprojects.png delete mode 100644 doc/qtcreator/images/creator_publishing.png delete mode 100644 doc/qtcreator/images/creator_testing.png create mode 100644 doc/qtcreator/images/front-advanced.png create mode 100644 doc/qtcreator/images/front-coding.png create mode 100644 doc/qtcreator/images/front-gs.png create mode 100644 doc/qtcreator/images/front-help.png create mode 100644 doc/qtcreator/images/front-preview.png create mode 100644 doc/qtcreator/images/front-projects.png create mode 100644 doc/qtcreator/images/front-publishing.png create mode 100644 doc/qtcreator/images/front-testing.png create mode 100644 doc/qtcreator/images/front-ui.png create mode 100644 doc/qtdesignstudio/images/studio-animation.svg delete mode 100644 doc/qtdesignstudio/images/studio-components.png delete mode 100644 doc/qtdesignstudio/images/studio-connections.png delete mode 100644 doc/qtdesignstudio/images/studio-gs.png delete mode 100644 doc/qtdesignstudio/images/studio-help.png delete mode 100644 doc/qtdesignstudio/images/studio-preview.png delete mode 100644 doc/qtdesignstudio/images/studio-projects.png delete mode 100644 doc/qtdesignstudio/images/studio-settings.png diff --git a/doc/qtcreator/images/creator_advanceduse.png b/doc/qtcreator/images/creator_advanceduse.png deleted file mode 100644 index c3ec46c38e..0000000000 Binary files a/doc/qtcreator/images/creator_advanceduse.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_buildingrunning.png b/doc/qtcreator/images/creator_buildingrunning.png deleted file mode 100644 index a52c4b392f..0000000000 Binary files a/doc/qtcreator/images/creator_buildingrunning.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_coding.png b/doc/qtcreator/images/creator_coding.png deleted file mode 100644 index 9597fe831f..0000000000 Binary files a/doc/qtcreator/images/creator_coding.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_designinguserinterface.png b/doc/qtcreator/images/creator_designinguserinterface.png deleted file mode 100644 index 85162a52ce..0000000000 Binary files a/doc/qtcreator/images/creator_designinguserinterface.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_gettinghelp.png b/doc/qtcreator/images/creator_gettinghelp.png deleted file mode 100644 index c3ae18b392..0000000000 Binary files a/doc/qtcreator/images/creator_gettinghelp.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_gettingstarted.png b/doc/qtcreator/images/creator_gettingstarted.png deleted file mode 100644 index e6177959ad..0000000000 Binary files a/doc/qtcreator/images/creator_gettingstarted.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_managingprojects.png b/doc/qtcreator/images/creator_managingprojects.png deleted file mode 100644 index dfb2ebe67d..0000000000 Binary files a/doc/qtcreator/images/creator_managingprojects.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_publishing.png b/doc/qtcreator/images/creator_publishing.png deleted file mode 100644 index b7e79a9bc3..0000000000 Binary files a/doc/qtcreator/images/creator_publishing.png and /dev/null differ diff --git a/doc/qtcreator/images/creator_testing.png b/doc/qtcreator/images/creator_testing.png deleted file mode 100644 index 395f898cdd..0000000000 Binary files a/doc/qtcreator/images/creator_testing.png and /dev/null differ diff --git a/doc/qtcreator/images/front-advanced.png b/doc/qtcreator/images/front-advanced.png new file mode 100644 index 0000000000..67e0ef2ad9 Binary files /dev/null and b/doc/qtcreator/images/front-advanced.png differ diff --git a/doc/qtcreator/images/front-coding.png b/doc/qtcreator/images/front-coding.png new file mode 100644 index 0000000000..da5cf5f3b6 Binary files /dev/null and b/doc/qtcreator/images/front-coding.png differ diff --git a/doc/qtcreator/images/front-gs.png b/doc/qtcreator/images/front-gs.png new file mode 100644 index 0000000000..16c0483535 Binary files /dev/null and b/doc/qtcreator/images/front-gs.png differ diff --git a/doc/qtcreator/images/front-help.png b/doc/qtcreator/images/front-help.png new file mode 100644 index 0000000000..9eb11f716a Binary files /dev/null and b/doc/qtcreator/images/front-help.png differ diff --git a/doc/qtcreator/images/front-preview.png b/doc/qtcreator/images/front-preview.png new file mode 100644 index 0000000000..fc57868e11 Binary files /dev/null and b/doc/qtcreator/images/front-preview.png differ diff --git a/doc/qtcreator/images/front-projects.png b/doc/qtcreator/images/front-projects.png new file mode 100644 index 0000000000..8ea1a82954 Binary files /dev/null and b/doc/qtcreator/images/front-projects.png differ diff --git a/doc/qtcreator/images/front-publishing.png b/doc/qtcreator/images/front-publishing.png new file mode 100644 index 0000000000..cd142df588 Binary files /dev/null and b/doc/qtcreator/images/front-publishing.png differ diff --git a/doc/qtcreator/images/front-testing.png b/doc/qtcreator/images/front-testing.png new file mode 100644 index 0000000000..79f80f750a Binary files /dev/null and b/doc/qtcreator/images/front-testing.png differ diff --git a/doc/qtcreator/images/front-ui.png b/doc/qtcreator/images/front-ui.png new file mode 100644 index 0000000000..3613a65676 Binary files /dev/null and b/doc/qtcreator/images/front-ui.png differ diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc index 5250c351b6..a8b86f6b58 100644 --- a/doc/qtcreator/src/editors/creator-coding.qdoc +++ b/doc/qtcreator/src/editors/creator-coding.qdoc @@ -41,7 +41,7 @@ \title Coding \if defined(qtcreator) - \image creator_coding.png + \image front-coding.png \endif \list diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc index 362425971a..7f89c0ea81 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc @@ -36,7 +36,7 @@ \title Advanced Use - \image creator_advanceduse.png + \image front-advanced.png \QC attempts to meet your development needs, whether you are an experienced Qt developer or a newcomer to Qt. When you install \QC diff --git a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc index 456df09ff7..67dbd629af 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc @@ -36,7 +36,7 @@ \title Designing User Interfaces - \image creator_designinguserinterface.png + \image front-ui.png \QC provides integrated visual editors for designing Qt Quick and widget-based applications in the Design mode. The integration diff --git a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc index 627bd49595..4efb8f79dd 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc @@ -38,9 +38,9 @@ \table \row - \li \inlineimage creator_gettingstarted.png - \li \inlineimage creator_designinguserinterface.png - \li \inlineimage creator_advanceduse.png + \li \inlineimage front-gs.png + \li \inlineimage front-ui.png + \li \inlineimage front-advanced.png \row \li \b {\l{IDE Overview}} @@ -59,8 +59,8 @@ control systems. For an overview of the options you have, go to \l{Configuring Qt Creator}. \row - \li \inlineimage creator_buildingrunning.png - \li \inlineimage creator_gettinghelp.png + \li \inlineimage front-preview.png + \li \inlineimage front-help.png \li \row \li \b {\l{Building and Running an Example}} diff --git a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc index 5ce2e861b0..b808d79e53 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc @@ -36,7 +36,7 @@ \title Getting Help - \image creator_gettinghelp.png + \image front-help.png \list diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc index 1ba098e4ee..98415f3760 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc @@ -47,9 +47,9 @@ \table \row - \li \inlineimage creator_managingprojects.png - \li \inlineimage creator_designinguserinterface.png - \li \inlineimage creator_coding.png + \li \inlineimage front-projects.png + \li \inlineimage front-ui.png + \li \inlineimage front-coding.png \row \li \b {\l{Managing Projects}} @@ -84,9 +84,9 @@ available that provides information about the code to IDEs. For more information, see \l{Coding}. \row - \li \inlineimage creator_buildingrunning.png - \li \inlineimage creator_testing.png - \li \inlineimage creator_publishing.png + \li \inlineimage front-preview.png + \li \inlineimage front-testing.png + \li \inlineimage front-publishing.png \row \li \b {\l{Building and Running}} diff --git a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc index c446fb82f7..cab7e02ee4 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc @@ -36,7 +36,7 @@ \title Testing - \image creator_testing.png + \image front-testing.png \list diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc index 2e69569f68..912863c18e 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc @@ -36,7 +36,7 @@ \title Tutorials - \image creator_gettinghelp.png + \image front-help.png You can use \QC to create applications for several platforms by using several technologies. The tutorials in this manual explain how to create diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc index d132bf4410..c98362ae17 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building-running.qdoc @@ -36,7 +36,7 @@ \title Building and Running - \image creator_buildingrunning.png + \image front-preview.png \QC provides support for running and deploying Qt applications built for different target platforms, or using different compilers, debuggers, or diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc index 53a3f11667..f2534ba8d8 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc @@ -36,7 +36,7 @@ \title Managing Projects - \image creator_managingprojects.png + \image front-projects.png One of the major advantages of \QC is that it allows a team of designers and developers to share a project across different development platforms with a diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index fe5e7f8175..71d2a2a1fe 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -54,10 +54,10 @@ \table \row - \li \inlineimage creator_gettingstarted.png - \li \inlineimage creator_managingprojects.png - \li \inlineimage creator_designinguserinterface.png - \li \inlineimage creator_coding.png + \li \inlineimage front-gs.png + \li \inlineimage front-projects.png + \li \inlineimage front-ui.png + \li \inlineimage front-coding.png \row \li \b {\l{Getting Started}} \list @@ -90,10 +90,10 @@ \li \l{Editing State Charts} \endlist \row - \li \inlineimage creator_buildingrunning.png - \li \inlineimage creator_testing.png - \li \inlineimage creator_advanceduse.png - \li \inlineimage creator_gettinghelp.png + \li \inlineimage front-preview.png + \li \inlineimage front-testing.png + \li \inlineimage front-advanced.png + \li \inlineimage front-help.png \row \li \b {\l{Building and Running}} \list diff --git a/doc/qtdesignstudio/images/studio-3d-scenes.png b/doc/qtdesignstudio/images/studio-3d-scenes.png index 94dbb54778..0dc2121f73 100644 Binary files a/doc/qtdesignstudio/images/studio-3d-scenes.png and b/doc/qtdesignstudio/images/studio-3d-scenes.png differ diff --git a/doc/qtdesignstudio/images/studio-animation.png b/doc/qtdesignstudio/images/studio-animation.png index 1bcabc0a13..1365c2df96 100644 Binary files a/doc/qtdesignstudio/images/studio-animation.png and b/doc/qtdesignstudio/images/studio-animation.png differ diff --git a/doc/qtdesignstudio/images/studio-animation.svg b/doc/qtdesignstudio/images/studio-animation.svg new file mode 100644 index 0000000000..7e4e93b0f2 --- /dev/null +++ b/doc/qtdesignstudio/images/studio-animation.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/qtdesignstudio/images/studio-components.png b/doc/qtdesignstudio/images/studio-components.png deleted file mode 100644 index d72388e53b..0000000000 Binary files a/doc/qtdesignstudio/images/studio-components.png and /dev/null differ diff --git a/doc/qtdesignstudio/images/studio-connections.png b/doc/qtdesignstudio/images/studio-connections.png deleted file mode 100644 index 787bfbdc95..0000000000 Binary files a/doc/qtdesignstudio/images/studio-connections.png and /dev/null differ diff --git a/doc/qtdesignstudio/images/studio-gs.png b/doc/qtdesignstudio/images/studio-gs.png deleted file mode 100644 index 898826e83d..0000000000 Binary files a/doc/qtdesignstudio/images/studio-gs.png and /dev/null differ diff --git a/doc/qtdesignstudio/images/studio-help.png b/doc/qtdesignstudio/images/studio-help.png deleted file mode 100644 index 3cee0bf635..0000000000 Binary files a/doc/qtdesignstudio/images/studio-help.png and /dev/null differ diff --git a/doc/qtdesignstudio/images/studio-preview.png b/doc/qtdesignstudio/images/studio-preview.png deleted file mode 100644 index 4f943f3f8d..0000000000 Binary files a/doc/qtdesignstudio/images/studio-preview.png and /dev/null differ diff --git a/doc/qtdesignstudio/images/studio-projects.png b/doc/qtdesignstudio/images/studio-projects.png deleted file mode 100644 index 623bc1f872..0000000000 Binary files a/doc/qtdesignstudio/images/studio-projects.png and /dev/null differ diff --git a/doc/qtdesignstudio/images/studio-settings.png b/doc/qtdesignstudio/images/studio-settings.png deleted file mode 100644 index 2ac37ea853..0000000000 Binary files a/doc/qtdesignstudio/images/studio-settings.png and /dev/null differ diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc index 74081404dd..5425477f9e 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc @@ -36,9 +36,9 @@ \table \row - \li \inlineimage studio-gs.png - \li \inlineimage studio-projects.png - \li \inlineimage studio-components.png + \li \inlineimage front-gs.png + \li \inlineimage front-projects.png + \li \inlineimage front-ui.png \li \inlineimage studio-animation.png \row \li \l{Getting Started} @@ -72,9 +72,9 @@ \endlist \row \li \inlineimage studio-3d-scenes.png - \li \inlineimage studio-preview.png - \li \inlineimage studio-settings.png - \li \inlineimage studio-help.png + \li \inlineimage front-preview.png + \li \inlineimage front-advanced.png + \li \inlineimage front-help.png \row \li \b {\l{Editing 3D Scenes}} \list -- cgit v1.2.1 From d5bfa21dfc2f010269404952f8e5212ca9d69194 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 5 May 2020 14:22:21 +0200 Subject: remove variant.hpp error So this can be used with a Qt 5.15 build outside of QtCreator. Change-Id: I691687bf661be21d9c28f13a52ff5df58bb7412a Reviewed-by: hjk --- src/libs/utils/variant.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/utils/variant.h b/src/libs/utils/variant.h index 371b9312d3..baf0c27816 100644 --- a/src/libs/utils/variant.h +++ b/src/libs/utils/variant.h @@ -29,9 +29,7 @@ See std(::experimental)::variant. */ -// TODO: replace by #include <(experimental/)variant> depending on compiler and C++ version #if __cplusplus >= 201703L -#error Please delete variant.hpp and the #else section below, then remove this error #include namespace Utils { -- cgit v1.2.1