diff --git a/CMakeLists.txt b/CMakeLists.txt index b6e0396a97b..d4cd30b44e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ find_package(Qt5 COMPONENTS LinguistTools) find_package(Threads) -find_package(Qt5 COMPONENTS Designer DesignerComponents Help Script SerialPort Svg QUIET) +find_package(Qt5 COMPONENTS Designer DesignerComponents Help SerialPort Svg QUIET) function (set_if_target var target) if (TARGET "${target}") diff --git a/doc/qtcreator/examples/accelbubble/Bubble.qml b/doc/qtcreator/examples/accelbubble/Bubble.qml index 67e1c5922da..043086fcdc9 100644 --- a/doc/qtcreator/examples/accelbubble/Bubble.qml +++ b/doc/qtcreator/examples/accelbubble/Bubble.qml @@ -1,60 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.9 -import QtQuick.Controls 2.2 +import QtQuick 2.14 +import QtQuick.Window 2.14 Image { + id: bubble source: "Bluebubble.svg" smooth: true property real centerX - property real centerY property real bubbleCenter + property real centerY + fillMode: Image.PreserveAspectFit } diff --git a/doc/qtcreator/examples/accelbubble/Page1Form.ui.qml b/doc/qtcreator/examples/accelbubble/Page1Form.ui.qml deleted file mode 100644 index 0ab08fc4833..00000000000 --- a/doc/qtcreator/examples/accelbubble/Page1Form.ui.qml +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 - -Page { - width: 600 - height: 400 - property alias bubble: bubble - property alias mainWindow: mainWindow - - header: Label { - text: qsTr("Page 1") - font.pixelSize: Qt.application.font.pixelSize * 2 - padding: 10 - } - - Rectangle { - id: mainWindow - color: "#ffffff" - anchors.fill: parent - - Bubble { - id: bubble - } - } -} diff --git a/doc/qtcreator/examples/accelbubble/Page2Form.ui.qml b/doc/qtcreator/examples/accelbubble/Page2Form.ui.qml deleted file mode 100644 index 11a8abff4aa..00000000000 --- a/doc/qtcreator/examples/accelbubble/Page2Form.ui.qml +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 - -Page { - width: 600 - height: 400 - - header: Label { - text: qsTr("Page 2") - font.pixelSize: Qt.application.font.pixelSize * 2 - padding: 10 - } - - Label { - text: qsTr("You are on Page 2.") - anchors.centerIn: parent - } -} diff --git a/doc/qtcreator/examples/accelbubble/accelbubble.pro b/doc/qtcreator/examples/accelbubble/accelbubble.pro index 2dfcd426527..a0caf1e9b2f 100644 --- a/doc/qtcreator/examples/accelbubble/accelbubble.pro +++ b/doc/qtcreator/examples/accelbubble/accelbubble.pro @@ -2,18 +2,12 @@ QT += quick sensors svg xml CONFIG += c++11 -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. +# You can make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -SOURCES += main.cpp +SOURCES += \ + main.cpp RESOURCES += qml.qrc @@ -28,10 +22,4 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target - ios { - QTPLUGIN += qsvg qsvgicon qtsensors_ios - QMAKE_INFO_PLIST = Info.plist - } - -DISTFILES += \ - Bluebubble.svg +ANDROID_ABIS = armeabi-v7a diff --git a/doc/qtcreator/examples/accelbubble/main.cpp b/doc/qtcreator/examples/accelbubble/main.cpp index 4e002b280ec..fa832817aa3 100644 --- a/doc/qtcreator/examples/accelbubble/main.cpp +++ b/doc/qtcreator/examples/accelbubble/main.cpp @@ -1,53 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - #include #include @@ -58,9 +8,13 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); - if (engine.rootObjects().isEmpty()) - return -1; + const QUrl url(QStringLiteral("qrc:/main.qml")); + QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, + &app, [url](QObject *obj, const QUrl &objUrl) { + if (!obj && url == objUrl) + QCoreApplication::exit(-1); + }, Qt::QueuedConnection); + engine.load(url); return app.exec(); } diff --git a/doc/qtcreator/examples/accelbubble/main.qml b/doc/qtcreator/examples/accelbubble/main.qml index 584ba4d1a72..6e567e819e9 100644 --- a/doc/qtcreator/examples/accelbubble/main.qml +++ b/doc/qtcreator/examples/accelbubble/main.qml @@ -1,105 +1,37 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +import QtQuick 2.14 +import QtQuick.Window 2.14 +import QtSensors 5.12 -import QtQuick 2.9 -import QtQuick.Controls 2.2 -import QtSensors 5.9 - -ApplicationWindow { +Window { + id: window visible: true - width: 640 - height: 480 - title: qsTr("Accelerate Bubble") - - SwipeView { - id: swipeView + property alias mainWindow: mainWindow + property alias bubble: bubble + Rectangle { + id: mainWindow + color: "#ffffff" anchors.fill: parent - currentIndex: tabBar.currentIndex - Page1Form { - bubble { - id: bubble - centerX: mainWindow.width / 2 - centerY: mainWindow.height / 2 - bubbleCenter: bubble.width / 2 - x: bubble.centerX - bubble.bubbleCenter - y: bubble.centerY - bubble.bubbleCenter + Bubble { + id: bubble + x: bubble.centerX - bubbleCenter + y: bubble.centerY - bubbleCenter + bubbleCenter: bubble.width /2 + centerX: mainWindow.width /2 + centerY: mainWindow.height /2 - Behavior on y { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 - } - } - Behavior on x { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 - } + Behavior on y { + SmoothedAnimation { + easing.type: Easing.Linear + duration: 100 + } + } + Behavior on x { + SmoothedAnimation { + easing.type: Easing.Linear + duration: 100 } } - } - - Page2Form { - } - } - - footer: TabBar { - id: tabBar - currentIndex: swipeView.currentIndex - - TabButton { - text: qsTr("Page 1") - } - TabButton { - text: qsTr("Page 2") } } @@ -107,6 +39,7 @@ ApplicationWindow { id: accel dataRate: 100 active: true + readonly property double radians_to_degrees: 180 / Math.PI onReadingChanged: { var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * 0.1) @@ -118,24 +51,24 @@ ApplicationWindow { if (newX < 0) newX = 0 - if (newX > page1.mainWindow.width - bubble.width) - newX = page1.mainWindow.width - bubble.width + if (newX > mainWindow.width - bubble.width) + newX = mainWindow.width - bubble.width if (newY < 18) newY = 18 - if (newY > page1.mainWindow.height - bubble.height) - newY = page1.mainWindow.height - bubble.height + if (newY > mainWindow.height - bubble.height) + newY = mainWindow.height - bubble.height - bubble.x = newX - bubble.y = newY + bubble.x = newX + bubble.y = newY } } - function calcPitch(x, y, z) { - return -(Math.atan(y / Math.sqrt(x * x + z * z)) * 57.2957795); + function calcPitch(x,y,z) { + return -Math.atan2(y, Math.hypot(x, z)) * accel.radians_to_degrees; } - function calcRoll(x, y, z) { - return -(Math.atan(x / Math.sqrt(y * y + z * z)) * 57.2957795); + function calcRoll(x,y,z) { + return -Math.atan2(x, Math.hypot(y, z)) * accel.radians_to_degrees; } } diff --git a/doc/qtcreator/examples/accelbubble/qml.qrc b/doc/qtcreator/examples/accelbubble/qml.qrc index 7d7777aca02..3e6f33859ad 100644 --- a/doc/qtcreator/examples/accelbubble/qml.qrc +++ b/doc/qtcreator/examples/accelbubble/qml.qrc @@ -1,10 +1,7 @@ - Page1Form.ui.qml - Page2Form.ui.qml - qtquickcontrols2.conf - Bubble.qml - Bluebubble.svg main.qml + Bluebubble.svg + Bubble.qml diff --git a/doc/qtcreator/examples/accelbubble/qtquickcontrols2.conf b/doc/qtcreator/examples/accelbubble/qtquickcontrols2.conf deleted file mode 100644 index 75b2cb8fffb..00000000000 --- a/doc/qtcreator/examples/accelbubble/qtquickcontrols2.conf +++ /dev/null @@ -1,6 +0,0 @@ -; This file can be edited to change the style of the application -; Read "Qt Quick Controls 2 Configuration File" for details: -; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html - -[Controls] -Style=Default diff --git a/doc/qtcreator/images/creator_android_tutorial_ex_app.png b/doc/qtcreator/images/creator_android_tutorial_ex_app.png index 3be9f31fe28..b31255f5812 100644 Binary files a/doc/qtcreator/images/creator_android_tutorial_ex_app.png and b/doc/qtcreator/images/creator_android_tutorial_ex_app.png differ diff --git a/doc/qtcreator/images/qtcreator-android-cmake-settings.png b/doc/qtcreator/images/qtcreator-android-cmake-settings.png index 7f8026bccab..e02c77c38bc 100644 Binary files a/doc/qtcreator/images/qtcreator-android-cmake-settings.png and b/doc/qtcreator/images/qtcreator-android-cmake-settings.png differ diff --git a/doc/qtcreator/images/qtcreator-clang-tools-options.png b/doc/qtcreator/images/qtcreator-clang-tools-options.png index 3fce1e2dffd..68616df1cd0 100644 Binary files a/doc/qtcreator/images/qtcreator-clang-tools-options.png and b/doc/qtcreator/images/qtcreator-clang-tools-options.png differ diff --git a/doc/qtcreator/images/qtcreator-cmake-build-settings.png b/doc/qtcreator/images/qtcreator-cmake-build-settings.png index c5da0555aaa..33be38d67c7 100644 Binary files a/doc/qtcreator/images/qtcreator-cmake-build-settings.png and b/doc/qtcreator/images/qtcreator-cmake-build-settings.png differ diff --git a/doc/qtcreator/images/qtcreator-cmake-build-steps.png b/doc/qtcreator/images/qtcreator-cmake-build-steps.png index 5809136a85c..02784e47d20 100644 Binary files a/doc/qtcreator/images/qtcreator-cmake-build-steps.png and b/doc/qtcreator/images/qtcreator-cmake-build-steps.png differ diff --git a/doc/qtcreator/images/qtcreator-cmake-clean-steps.png b/doc/qtcreator/images/qtcreator-cmake-clean-steps.png index 88be99d715a..e04711c3a74 100644 Binary files a/doc/qtcreator/images/qtcreator-cmake-clean-steps.png and b/doc/qtcreator/images/qtcreator-cmake-clean-steps.png differ diff --git a/doc/qtcreator/images/qtcreator-cmakeexecutable.png b/doc/qtcreator/images/qtcreator-cmakeexecutable.png index 5c575887623..31f162d48b1 100755 Binary files a/doc/qtcreator/images/qtcreator-cmakeexecutable.png and b/doc/qtcreator/images/qtcreator-cmakeexecutable.png differ diff --git a/doc/qtcreator/images/qtcreator-debugger-attach-to-running-debug-server.png b/doc/qtcreator/images/qtcreator-debugger-attach-to-running-debug-server.png index da89073d8a4..296d4e6e6f2 100644 Binary files a/doc/qtcreator/images/qtcreator-debugger-attach-to-running-debug-server.png and b/doc/qtcreator/images/qtcreator-debugger-attach-to-running-debug-server.png differ diff --git a/doc/qtcreator/images/qtcreator-debugger-general-options.png b/doc/qtcreator/images/qtcreator-debugger-general-options.png new file mode 100644 index 00000000000..8732a076a62 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-debugger-general-options.png differ diff --git a/doc/qtcreator/images/qtcreator-debugger-load-core-file.png b/doc/qtcreator/images/qtcreator-debugger-load-core-file.png index 72b647d6cea..d45b97a5a9e 100644 Binary files a/doc/qtcreator/images/qtcreator-debugger-load-core-file.png and b/doc/qtcreator/images/qtcreator-debugger-load-core-file.png differ diff --git a/doc/qtcreator/images/qtcreator-debugger-start-external.png b/doc/qtcreator/images/qtcreator-debugger-start-external.png index 2dc7bff9414..2dc696115fb 100644 Binary files a/doc/qtcreator/images/qtcreator-debugger-start-external.png and b/doc/qtcreator/images/qtcreator-debugger-start-external.png differ diff --git a/doc/qtcreator/images/qtcreator-kits-cmake.png b/doc/qtcreator/images/qtcreator-kits-cmake.png new file mode 100644 index 00000000000..9ccecb61db1 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-kits-cmake.png differ diff --git a/doc/qtcreator/images/qtcreator-move-component-into-separate-file.png b/doc/qtcreator/images/qtcreator-move-component-into-separate-file.png index 6ebf605c56b..3e444ab1bd5 100644 Binary files a/doc/qtcreator/images/qtcreator-move-component-into-separate-file.png and b/doc/qtcreator/images/qtcreator-move-component-into-separate-file.png differ diff --git a/doc/qtcreator/images/qtquick-mobile-app-tutorial-binding-editor.png b/doc/qtcreator/images/qtquick-mobile-app-tutorial-binding-editor.png new file mode 100644 index 00000000000..2f759e125fa Binary files /dev/null and b/doc/qtcreator/images/qtquick-mobile-app-tutorial-binding-editor.png differ diff --git a/doc/qtcreator/images/qtquick-mobile-app-tutorial-binding-editor1.png b/doc/qtcreator/images/qtquick-mobile-app-tutorial-binding-editor1.png new file mode 100644 index 00000000000..2b0b4082ef3 Binary files /dev/null and b/doc/qtcreator/images/qtquick-mobile-app-tutorial-binding-editor1.png differ diff --git a/doc/qtcreator/images/qtquick-mobile-app-tutorial-custom-properties.png b/doc/qtcreator/images/qtquick-mobile-app-tutorial-custom-properties.png new file mode 100644 index 00000000000..0368c4f8c0d Binary files /dev/null and b/doc/qtcreator/images/qtquick-mobile-app-tutorial-custom-properties.png differ diff --git a/doc/qtcreator/images/qtquick-mobile-app-tutorial-image.png b/doc/qtcreator/images/qtquick-mobile-app-tutorial-image.png new file mode 100644 index 00000000000..53b2b5544e7 Binary files /dev/null and b/doc/qtcreator/images/qtquick-mobile-app-tutorial-image.png differ diff --git a/doc/qtcreator/images/qtquick-mobile-app-tutorial-main-view.png b/doc/qtcreator/images/qtquick-mobile-app-tutorial-main-view.png new file mode 100644 index 00000000000..bba67363b55 Binary files /dev/null and b/doc/qtcreator/images/qtquick-mobile-app-tutorial-main-view.png differ diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc index 6bc4ac9825a..804b8695a12 100644 --- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc +++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc @@ -128,6 +128,9 @@ \image qtcreator-clang-tools-options.png "Clang Tools options tab" + \li In the \uicontrol Clang-Tidy and \uicontrol Clazy-Standalone fields, + set the paths to the executables to use. + \li To build the project before running the Clang tools, select the \uicontrol {Build the project before analysis} check box. The Clang tools do not require the project to be built before analysis, but @@ -135,9 +138,9 @@ generated during the build. For big projects, not building the project might save some time. - \li In the \uicontrol {Simultaneous processes} field, select the number - of processes to run simultaneously to make the analysis faster on - multi-core processors. + \li In the \uicontrol {Parallel jobs} field, select the number of jobs + to run in parallel to make the analysis faster on multi-core + processors. \li In the \uicontrol {Diagnostic Configuration} group, select \uicontrol Manage to create or edit a custom configuration. diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdocinc b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdocinc index a31449984ce..d197facbc67 100644 --- a/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdocinc +++ b/doc/qtcreator/src/cmake/creator-projects-cmake-building.qdocinc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -34,32 +34,45 @@ \section2 CMake Build Configuration + Configuring medium-sized to large CMake projects in \QC can be a + challenge due to the number of options that you need to pass to + CMake to configure the project correctly. \QC creates an initial + configuration for you based on the kit settings and displays it in + the \uicontrol {Initial CMake parameters} field. + \image qtcreator-cmake-build-settings.png - Setting names with a common prefix (up to the first underscore character) - are grouped under the prefix. To view all settings, select the - \uicontrol Advanced check box. + In the \uicontrol Value column, you can view and edit the actual values + of the parameters that are passed to CMake. Parameter names are listed + in the \uicontrol Key column. Names with a common prefix (up to the first + underscore character) are grouped under the prefix. To view all parameters, + select the \uicontrol Advanced check box. - To add build settings, select \uicontrol Add, and then select the type of - the setting that you are adding: \uicontrol Boolean, \uicontrol String, + To add parameters, select \uicontrol Add, and then select the type of + the parameter that you are adding: \uicontrol Boolean, \uicontrol String, \uicontrol Directory, or \uicontrol File. - To change the type of the selected setting, select + To change the type of the selected parameter, select \uicontrol {Force to bool}, \uicontrol {Force to file}, \uicontrol {Force to directory}, or \uicontrol {Force to string}. - To modify the value of a build setting, double-click it, or select it, + To modify the value of a parameter, double-click it, or select it, and then select \uicontrol Edit. To save the changes, select \uicontrol {Apply Configuration Changes}. Keep in mind that a configuration change might trigger a follow-up configuration change. - To remove a setting, select \uicontrol Unset. + To remove a parameter, select \uicontrol Unset. To reset the changes that you made, select \uicontrol Reset. - To reconfigure CMake, select \uicontrol Build > - \uicontrol {Clear CMake Configuration}, and then - select \uicontrol Build > \uicontrol {Rescan Project}. + The parameter values that you change are passed via \c -D