diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-11 11:36:22 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-11 11:36:22 +0200 |
| commit | 20ef5c6de33e944f22173267ccd39f7629e057d9 (patch) | |
| tree | aa830e4e42fa269fa7b316dec08da7821cacbd72 | |
| parent | b9e79f7852aa46b4ccbcda666f1bf99db0690272 (diff) | |
| parent | c370d345f19c36016ba0784efe9e65c0cb059947 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: Ibbf9f16677a58bdcdd3ce63701ffa34db6f44916
270 files changed, 2794 insertions, 432 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index f6387b7919f..d88cff2fc66 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -3,6 +3,10 @@ if(QT_CREATOR_API_DEFINED) endif() set(QT_CREATOR_API_DEFINED TRUE) +if (CMAKE_VERSION VERSION_LESS 3.16) + set(BUILD_WITH_PCH OFF) +endif() + include(FeatureSummary) # diff --git a/dist/changes-4.12.1.md b/dist/changes-4.12.1.md new file mode 100644 index 00000000000..8a80e1f0f71 --- /dev/null +++ b/dist/changes-4.12.1.md @@ -0,0 +1,76 @@ +Qt Creator 4.12.1 +================= + +Qt Creator version 4.12.1 contains bug fixes. + +The most important changes are listed in this document. For a complete +list of changes, see the Git log for the Qt Creator sources that +you can check out from the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline origin/v4.12.0..v4.12.1 + +General +------- + +* Fixed crash when changing font settings (QTCREATORBUG-14385) + +Editing +------- + +### C++ + +* Fixed crash when loading settings from Qt Creator < 4.11 (QTCREATORBUG-23916) + +### QML + +* Fixed semantic highlighting (QTCREATORBUG-23729, QTCREATORBUG-23777) +* Fixed wrong symbol highlighting (QTCREATORBUG-23830) +* Fixed warning for `palette` property (QTCREATORBUG-23830) + +Projects +-------- + +### qmake + +* Fixed that run button could stay disabled after parsing + +### CMake + +* Fixed issue with JOM (QTCREATORBUG-22645) + +### Compilation Database + +* Fixed issues with symbolic links (QTCREATORBUG-23511) + +Debugging +--------- + +* Fixed pretty printing of `std::unique_ptr` with custom deleter (QTCREATORBUG-23885) + + +Qt Quick Designer +----------------- + +* Fixed crash after building emulation layer (QTCREATORBUG-20364) +* Fixed crash when opening `.qml` file instead of `.qml.ui` file (QDS-2011) + +Test Integration +---------------- + +* Fixed handling of test output (QTCREATORBUG-23939) + +Platforms +--------- + +### Android + +* Fixed crash at startup when Qt is missing in Kit (QTCREATORBUG-23963) +* Fixed `Always use this device for this project` (QTCREATORBUG-23918) + +### OpenBSD + +* Fixed Qt ABI detection (QTCREATORBUG-23818) + +Credits for these changes go to: +-------------------------------- diff --git a/doc/qtcreator/images/qmldesigner-form-editor.png b/doc/qtcreator/images/qmldesigner-form-editor.png Binary files differnew file mode 100644 index 00000000000..66aaa7229d3 --- /dev/null +++ b/doc/qtcreator/images/qmldesigner-form-editor.png diff --git a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc index 1d0c9f6e1a2..c32e8854b03 100644 --- a/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc +++ b/doc/qtcreator/src/analyze/cpu-usage-analyzer.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-heob.html \page creator-cpu-usage-analyzer.html \nextpage creator-cppcheck.html diff --git a/doc/qtcreator/src/analyze/creator-analyze.qdoc b/doc/qtcreator/src/analyze/creator-analyze.qdoc index 1e98c0f2149..06fe3ce1b71 100644 --- a/doc/qtcreator/src/analyze/creator-analyze.qdoc +++ b/doc/qtcreator/src/analyze/creator-analyze.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-troubleshooting-debugging.html \page creator-analyze-mode.html \nextpage creator-qml-performance-monitor.html diff --git a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc index 1ab345bb03e..c06c75ed933 100644 --- a/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc +++ b/doc/qtcreator/src/analyze/creator-clang-static-analyzer.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-running-valgrind-remotely.html \page creator-clang-tools.html \nextpage creator-heob.html diff --git a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc index ab45382f741..a278f2db6d6 100644 --- a/doc/qtcreator/src/analyze/creator-cppcheck.qdoc +++ b/doc/qtcreator/src/analyze/creator-cppcheck.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-cpu-usage-analyzer.html \page creator-cppcheck.html \nextpage creator-ctf-visualizer.html diff --git a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc index 5440c34fb94..87f63f95e44 100644 --- a/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc +++ b/doc/qtcreator/src/analyze/creator-ctf-visualizer.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-cppcheck.html \page creator-ctf-visualizer.html \nextpage creator-autotest.html diff --git a/doc/qtcreator/src/analyze/creator-heob.qdoc b/doc/qtcreator/src/analyze/creator-heob.qdoc index 54f0a4cf264..1c484450c99 100644 --- a/doc/qtcreator/src/analyze/creator-heob.qdoc +++ b/doc/qtcreator/src/analyze/creator-heob.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-clang-tools.html \page creator-heob.html \nextpage creator-cpu-usage-analyzer.html diff --git a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc index 7c72c362c0d..919932e7a3d 100644 --- a/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc +++ b/doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-qml-performance-monitor.html \page creator-valgrind-overview.html \nextpage creator-analyzer.html diff --git a/doc/qtcreator/src/analyze/creator-valgrind.qdoc b/doc/qtcreator/src/analyze/creator-valgrind.qdoc index b2b7cc7f686..210ea15f123 100644 --- a/doc/qtcreator/src/analyze/creator-valgrind.qdoc +++ b/doc/qtcreator/src/analyze/creator-valgrind.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-valgrind-overview.html \page creator-analyzer.html \nextpage creator-cache-profiler.html @@ -140,7 +139,6 @@ */ /*! - \contentspage index.html \previouspage creator-analyzer.html \page creator-cache-profiler.html \nextpage creator-running-valgrind-remotely.html @@ -271,7 +269,6 @@ */ /*! - \contentspage index.html \previouspage creator-cache-profiler.html \page creator-running-valgrind-remotely.html \nextpage creator-clang-tools.html diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc index e2095df83c3..950fe6e9aae 100644 --- a/doc/qtcreator/src/android/androiddev.qdoc +++ b/doc/qtcreator/src/android/androiddev.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \page creator-developing-android.html \previouspage creator-connecting-mobile.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/android/deploying-android.qdoc b/doc/qtcreator/src/android/deploying-android.qdoc index c4ece062167..0e00224c646 100644 --- a/doc/qtcreator/src/android/deploying-android.qdoc +++ b/doc/qtcreator/src/android/deploying-android.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \previouspage creator-deployment.html \page creator-deploying-android.html \nextpage creator-deployment-embedded-linux.html diff --git a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc index d3ac93f133c..3382cfa1d63 100644 --- a/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc +++ b/doc/qtcreator/src/baremetal/creator-baremetal-dev.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \previouspage creator-developing-android.html \page creator-developing-baremetal.html \nextpage creator-developing-generic-linux.html diff --git a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc index 511c0c9843d..3dd3a9197a3 100644 --- a/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc +++ b/doc/qtcreator/src/cmake/creator-projects-cmake.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-other.html \page creator-project-cmake.html \nextpage creator-project-qbs.html diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc index 9b8a6b5262d..7efb6bd0e6f 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-example.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-debugging-qml.html \page creator-debugging-example.html \nextpage creator-qml-debugging-example.html diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc index 379e821eb5a..52270709ed0 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger-setup.qdoc @@ -31,7 +31,6 @@ /*! - \contentspage index.html \previouspage creator-debugging.html \page creator-debugger-engines.html \nextpage creator-debugger-operating-modes.html diff --git a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc index 3df294cfdb4..fdcec02bbcd 100644 --- a/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc +++ b/doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-testing.html \page creator-debugging.html \nextpage creator-debugger-engines.html @@ -98,7 +97,6 @@ /*! - \contentspage index.html \previouspage creator-debugger-engines.html \page creator-debugger-operating-modes.html \nextpage creator-debug-mode.html @@ -550,7 +548,6 @@ /*! - \contentspage index.html \page creator-debug-mode.html \if defined(qtdesignstudio) \previouspage studio-debugging.html @@ -837,7 +834,6 @@ /*! - \contentspage index.html \previouspage creator-debug-mode.html \page creator-debugging-helpers.html \nextpage creator-debugging-qml.html @@ -1435,7 +1431,6 @@ /*! - \contentspage index.html \previouspage creator-qml-debugging-example.html \page creator-troubleshooting-debugging.html \nextpage creator-analyze-mode.html diff --git a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc index b07c8eb5756..24ab6934eb9 100644 --- a/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/qtcreator/src/debugger/qtquick-debugger-example.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-qml-debugging-example.html \if defined(qtdesignstudio) \previouspage creator-debugging-qml.html diff --git a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc index f646e752c9d..98978259acb 100644 --- a/doc/qtcreator/src/debugger/qtquick-debugging.qdoc +++ b/doc/qtcreator/src/debugger/qtquick-debugging.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-debugging-qml.html \if defined(qtdesignstudio) \previouspage studio-debugging.html diff --git a/doc/qtcreator/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc index 7a946d33256..c21ebef7b3e 100644 --- a/doc/qtcreator/src/editors/creator-code-completion.qdoc +++ b/doc/qtcreator/src/editors/creator-code-completion.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-checking-code-syntax.html \page creator-completing-code.html \nextpage creator-indenting-code.html diff --git a/doc/qtcreator/src/editors/creator-code-indentation.qdoc b/doc/qtcreator/src/editors/creator-code-indentation.qdoc index c1427f460a2..841f5c5b774 100644 --- a/doc/qtcreator/src/editors/creator-code-indentation.qdoc +++ b/doc/qtcreator/src/editors/creator-code-indentation.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-completing-code.html \page creator-indenting-code.html \nextpage qt-quick-toolbars.html diff --git a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc index 89c6670e7e0..8e94c1622e8 100644 --- a/doc/qtcreator/src/editors/creator-code-refactoring.qdoc +++ b/doc/qtcreator/src/editors/creator-code-refactoring.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page creator-editor-refactoring.html \previouspage creator-editor-locator.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/editors/creator-code-syntax.qdoc b/doc/qtcreator/src/editors/creator-code-syntax.qdoc index 4d05f3f288e..8da38dd3bf6 100644 --- a/doc/qtcreator/src/editors/creator-code-syntax.qdoc +++ b/doc/qtcreator/src/editors/creator-code-syntax.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-highlighting.html \page creator-checking-code-syntax.html \nextpage creator-completing-code.html diff --git a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc index c470d183be3..315f19da930 100644 --- a/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-editor-functions.html \page creator-coding-navigating.html \nextpage creator-highlighting.html diff --git a/doc/qtcreator/src/editors/creator-coding.qdoc b/doc/qtcreator/src/editors/creator-coding.qdoc index 11990f46185..5250c351b6d 100644 --- a/doc/qtcreator/src/editors/creator-coding.qdoc +++ b/doc/qtcreator/src/editors/creator-coding.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-coding.html \if defined(qtdesignstudio) \previouspage creator-keyboard-shortcuts.html diff --git a/doc/qtcreator/src/editors/creator-diff-editor.qdoc b/doc/qtcreator/src/editors/creator-diff-editor.qdoc index 11608e0ce53..ca73e3b0f06 100644 --- a/doc/qtcreator/src/editors/creator-diff-editor.qdoc +++ b/doc/qtcreator/src/editors/creator-diff-editor.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-diff-editor.html \if defined(qtdesignstudio) \previouspage qt-quick-toolbars.html diff --git a/doc/qtcreator/src/editors/creator-editors-options-text.qdoc b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc index 41a394b3d13..24660d3cee1 100644 --- a/doc/qtcreator/src/editors/creator-editors-options-text.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-options-text.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-editor-options-text.html \previouspage creator-editor-options.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/editors/creator-editors-options.qdoc b/doc/qtcreator/src/editors/creator-editors-options.qdoc index c5d8bf534fa..317fe2dbcd4 100644 --- a/doc/qtcreator/src/editors/creator-editors-options.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-options.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-editor-options.html \if defined(qtdesignstudio) \previouspage creator-editor-refactoring.html diff --git a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc index fa87b7ebb9b..3bb5f5832e5 100644 --- a/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc +++ b/doc/qtcreator/src/editors/creator-editors-writing-code.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-coding.html \page creator-editor-functions.html \nextpage creator-coding-navigating.html diff --git a/doc/qtcreator/src/editors/creator-finding.qdoc b/doc/qtcreator/src/editors/creator-finding.qdoc index c9a4c371b74..53477ed1dec 100644 --- a/doc/qtcreator/src/editors/creator-finding.qdoc +++ b/doc/qtcreator/src/editors/creator-finding.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-finding-overview.html \if defined(qtdesignstudio) \previouspage creator-diff-editor.html diff --git a/doc/qtcreator/src/editors/creator-locator.qdoc b/doc/qtcreator/src/editors/creator-locator.qdoc index 951e61f4905..73b0ecbe904 100644 --- a/doc/qtcreator/src/editors/creator-locator.qdoc +++ b/doc/qtcreator/src/editors/creator-locator.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-editor-finding.html \page creator-editor-locator.html \nextpage creator-editor-refactoring.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc index e945cea4243..11727cb091e 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-beautifier.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-editor-refactoring.html \page creator-beautifier.html \nextpage creator-editor-options.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc index 1b7b36baf8b..3a6b40c4866 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-clang-codemodel.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-diff-editor.html \page creator-clang-codemodel.html \nextpage creator-finding-overview.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc index 7e0899db002..852500d1b0f 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-code-pasting.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage qt-quick-toolbars.html \page creator-editor-codepasting.html \nextpage creator-macros.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc index 09e7323e459..6e14ef2fd65 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-fakevim.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-editor-options-text.html \page creator-editor-fakevim.html \nextpage creator-language-servers.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc index b6c09ff1f4a..ea8ecdc472b 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-language-server.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-editor-fakevim.html \page creator-language-servers.html \nextpage creator-mime-types.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc index 1f5e6bb1754..ee04620d422 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-mime-types.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-language-servers.html \page creator-mime-types.html \nextpage creator-modeling.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc index 9b5dc4e1652..10e40c2849c 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-modeling.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-mime-types.html \page creator-modeling.html \nextpage creator-scxml.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc index 403eeb52787..a8eee8965c5 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-scxml.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-modeling.html \page creator-scxml.html \nextpage creator-building-running.html diff --git a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc index dba49c516c3..99f5f00e379 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-text-editing-macros.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-editor-codepasting.html \page creator-macros.html \nextpage creator-diff-editor.html diff --git a/doc/qtcreator/src/editors/creator-search.qdoc b/doc/qtcreator/src/editors/creator-search.qdoc index a480b79c959..8c79e59700e 100644 --- a/doc/qtcreator/src/editors/creator-search.qdoc +++ b/doc/qtcreator/src/editors/creator-search.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-finding-overview.html \page creator-editor-finding.html \nextpage creator-editor-locator.html diff --git a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc index ae6cb6a6535..728936dec27 100644 --- a/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc +++ b/doc/qtcreator/src/editors/creator-semantic-highlighting.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-coding-navigating.html \page creator-highlighting.html \nextpage creator-checking-code-syntax.html diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc index 84e49851015..c06ef08d7fc 100644 --- a/doc/qtcreator/src/howto/creator-external-tools.qdoc +++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-editor-external.html \if defined(qtdesignstudio) \previouspage creator-qml-performance-monitor.html diff --git a/doc/qtcreator/src/howto/creator-help.qdoc b/doc/qtcreator/src/howto/creator-help.qdoc index 1b2e7f48f1d..90e007ceeb7 100644 --- a/doc/qtcreator/src/howto/creator-help.qdoc +++ b/doc/qtcreator/src/howto/creator-help.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page creator-help.html \if defined(qtdesignstudio) \previouspage {Examples and Tutorials} diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index 661d8495bab..03f697695d0 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-keyboard-shortcuts.html \if defined(qtdesignstudio) \previouspage studio-platforms.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc index abfa24e70b9..78c7ffb680e 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-autotest.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-ctf-visualizer.html \page creator-autotest.html \nextpage creator-advanced.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc index 16b453e74cf..3ec803df2f1 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-cli.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-nimble.html \page creator-cli.html \nextpage creator-keyboard-shortcuts.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index b96d23be879..f51b91006dc 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-faq.html \page creator-how-tos.html \nextpage creator-known-issues.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc b/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc index 0c939f5d27b..e2c3816f86e 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-sessions.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-sharing-project-settings.html \page creator-project-managing-sessions.html \nextpage creator-design-mode.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc index 9ef66cc6889..cc61374e7c3 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-task-lists.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-editor-external.html \page creator-task-lists.html \nextpage creator-telemetry.html diff --git a/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc b/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc index a9cc4359d19..de1a9d66798 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-telemetry.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-task-lists.html \page creator-telemetry.html \nextpage creator-help-overview.html diff --git a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc index 7aac8fc0a95..4035cda3d07 100644 --- a/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc +++ b/doc/qtcreator/src/howto/creator-only/qtcreator-faq.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-help.html \page creator-faq.html \nextpage creator-how-tos.html diff --git a/doc/qtcreator/src/howto/creator-sidebars.qdoc b/doc/qtcreator/src/howto/creator-sidebars.qdoc index 6cc9feebc4f..9ef27ef1478 100644 --- a/doc/qtcreator/src/howto/creator-sidebars.qdoc +++ b/doc/qtcreator/src/howto/creator-sidebars.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page creator-sidebars.html \previouspage creator-views.html \nextpage creator-project-managing-workspaces.html diff --git a/doc/qtcreator/src/howto/creator-ui.qdoc b/doc/qtcreator/src/howto/creator-ui.qdoc index 543c1405605..2f5dc4f274e 100644 --- a/doc/qtcreator/src/howto/creator-ui.qdoc +++ b/doc/qtcreator/src/howto/creator-ui.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-quick-tour.html \if defined(qtdesignstudio) \previouspage qtbridge-ps-using.html @@ -256,7 +255,6 @@ */ /*! - \contentspage index.html \page creator-modes.html \previouspage creator-quick-tour.html \nextpage creator-views.html @@ -331,7 +329,6 @@ */ /*! - \contentspage index.html \page creator-output-panes.html \previouspage creator-project-managing-workspaces.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/howto/creator-views.qdoc b/doc/qtcreator/src/howto/creator-views.qdoc index fe7c8254f3f..1b37513fbdd 100644 --- a/doc/qtcreator/src/howto/creator-views.qdoc +++ b/doc/qtcreator/src/howto/creator-views.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page creator-views.html \previouspage creator-modes.html \nextpage creator-sidebars.html diff --git a/doc/qtcreator/src/howto/creator-workspaces.qdoc b/doc/qtcreator/src/howto/creator-workspaces.qdoc index 49dfa82a37e..7696c481ca0 100644 --- a/doc/qtcreator/src/howto/creator-workspaces.qdoc +++ b/doc/qtcreator/src/howto/creator-workspaces.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-sidebars.html \page creator-project-managing-workspaces.html \nextpage creator-output-panes.html diff --git a/doc/qtcreator/src/ios/creator-ios-dev.qdoc b/doc/qtcreator/src/ios/creator-ios-dev.qdoc index 633d0275215..c2eb07f9aef 100644 --- a/doc/qtcreator/src/ios/creator-ios-dev.qdoc +++ b/doc/qtcreator/src/ios/creator-ios-dev.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \previouspage creator-developing-generic-linux.html \page creator-developing-ios.html \nextpage creator-developing-mcu.html diff --git a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc index 6d2ad9c2e13..7eeb4f68206 100644 --- a/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc +++ b/doc/qtcreator/src/linux-mobile/creator-deployment-embedded-linux.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-deployment-embedded-linux.html \previouspage creator-deploying-android.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc index eefce112f1a..da7e6cca083 100644 --- a/doc/qtcreator/src/linux-mobile/linuxdev.qdoc +++ b/doc/qtcreator/src/linux-mobile/linuxdev.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \page creator-developing-generic-linux.html \if defined(qtdesignstudio) \previouspage creator-developing-android.html diff --git a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc index 69f7dd8aa6e..00295d01348 100644 --- a/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc +++ b/doc/qtcreator/src/mcu/creator-mcu-dev.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-developing-ios.html \page creator-developing-mcu.html \nextpage creator-developing-qnx.html diff --git a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc index 0ed535bb416..bdd45fd1897 100644 --- a/doc/qtcreator/src/overview/creator-acknowledgements.qdoc +++ b/doc/qtcreator/src/overview/creator-acknowledgements.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-acknowledgements.html \if defined(qtdesignstudio) \previouspage studio-terms.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc index e31f6199ff9..362425971a1 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-advanced.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-autotest.html \page creator-advanced.html \nextpage creator-os-supported-platforms.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc index 3b5380b9504..a227fe0d194 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-commercial-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-commercial-overview.html \title Commercial Features diff --git a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc index 3cb1f5709a1..0c07923b8af 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-configuring.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-output-panes.html \page creator-configuring.html \nextpage creator-build-example-application.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc index a8216d313e3..21903f7ad53 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-deployment-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-running-targets.html \page creator-deployment.html \nextpage creator-deploying-android.html 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 9b2537a356e..456df09ff7f 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-design-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-managing-sessions.html \page creator-design-mode.html \nextpage creator-visual-editor.html 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 1407cf33581..627bd495955 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-getting-started.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage index.html \page creator-getting-started.html \nextpage creator-overview.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc index 5ddee7b0b0d..03e862e2949 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-glossary.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-known-issues.html \page creator-glossary.html \nextpage technical-support.html 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 8798219a011..5ce2e861b06 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-help-overview.html \previouspage creator-telemetry.html \nextpage creator-help.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc index 453718b219d..578a2892192 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-issues.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-how-tos.html \page creator-known-issues.html \nextpage creator-glossary.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc index 470d5c2360b..97daacfd62e 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-connecting-mobile.html \previouspage creator-deployment-qnx.html \nextpage creator-developing-android.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc index 4210894cdfb..1ba098e4ee9 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-getting-started.html \page creator-overview.html \nextpage creator-quick-tour.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc index f98d17a503a..7013ee6cea0 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-supported-platforms.qdoc @@ -31,7 +31,6 @@ /*! - \contentspage index.html \previouspage creator-advanced.html \page creator-os-supported-platforms.html \nextpage creator-project-other.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc index f851b19e8c5..fb06269199e 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-glossary.html \page technical-support.html \nextpage creator-acknowledgements.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc index 10df1d7f31d..c446fb82f70 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-testing.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-build-process-customizing.html \page creator-testing.html \nextpage creator-debugging.html diff --git a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc index ec2ba4fdf95..2e69569f688 100644 --- a/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc +++ b/doc/qtcreator/src/overview/creator-only/creator-tutorials.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-build-example-application.html \page creator-tutorials.html \nextpage {Creating a Qt Quick Application} diff --git a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc index b627c35a8d0..9a4a9c94fd9 100644 --- a/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc +++ b/doc/qtcreator/src/overview/creator-only/mobile-app-design.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage adding-plugins.html \page creator-usability.html \nextpage creator-coding.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc index 9dc854433bb..5df4bbead76 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-autotools.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-project-qbs.html \page creator-projects-autotools.html \nextpage creator-project-generic.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc index 80e58ac0e4f..c536c91cddc 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-configuring.html \page creator-build-example-application.html \nextpage creator-tutorials.html 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 0e1c2c581aa..d132bf44108 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 @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-scxml.html \page creator-building-running.html \nextpage creator-live-preview.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc index b1bb63a20ca..29ab47eae9a 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage qt-design-viewer.html \page creator-building-targets.html \nextpage creator-running-targets.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc index 699e46d53b5..f018020f54a 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-builds-customizing.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-build-process-customizing.html \if defined(qtdesignstudio) \previouspage creator-developing-generic-linux.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc index 30d39dbffa9..7d350259065 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-compilers.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-qmake.html \page creator-tool-chains.html \nextpage creator-debuggers.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc index 209ae104737..3a2ca1515b7 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-managing.html \page creator-project-creating.html \nextpage creator-project-opening.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc index 56a54a26601..6a919d5da2b 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-qmake-libraries.html \page creator-project-wizards.html \nextpage creator-version-control.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc index ebd1f6c366d..3ef847e4b87 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-debuggers.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-tool-chains.html \page creator-debuggers.html \nextpage creator-build-settings.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc index 01056384a32..4a2c4c42ab0 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-generic.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-projects-autotools.html \page creator-project-generic.html \nextpage creator-project-nimble.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc index 1a5248ca4ef..6360edc893e 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-libraries.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-opening.html \page creator-project-qmake-libraries.html \nextpage creator-project-wizards.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc index 100edd09376..6df963bdf8e 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-nimble.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-project-generic.html \page creator-project-nimble.html \nextpage creator-cli.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc index 60fb2c16445..929996dd985 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-opening.qdoc @@ -31,7 +31,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-creating.html \page creator-project-opening.html \nextpage creator-project-qmake-libraries.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc index 0d02868d208..5ff6d1b6374 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-other.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-os-supported-platforms.html \page creator-project-other.html \nextpage creator-project-cmake.html 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 42adf40ed88..53a3f116678 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage accelbubble \page creator-project-managing.html \nextpage creator-project-creating.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc index c17c147667f..df44ceba5e0 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qbs.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-project-cmake.html \page creator-project-qbs.html \nextpage creator-projects-autotools.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc index db9f985bd9c..0c171dc8cef 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-qt-versions.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-targets.html \page creator-project-qmake.html \nextpage creator-tool-chains.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc index c898b337ee2..73c7c383e2a 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-build.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-debuggers.html \page creator-build-settings.html \nextpage creator-run-settings.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc index 2fd798458aa..67d8859490e 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-code-style.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-editor-settings.html \page creator-code-style-settings.html \nextpage creator-build-dependencies.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc index 013987e5c78..e52f35ea4b5 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-dependencies.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-build-dependencies.html \previouspage creator-code-style-settings.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc index 5f8d6c6fb1f..2f5ea21a01c 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-editor.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-run-settings.html \page creator-editor-settings.html \nextpage creator-code-style-settings.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc index f65d7485656..89eb026500f 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-environment.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-build-dependencies.html \page creator-project-settings-environment.html \nextpage creator-sharing-project-settings.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc index 7b8386737c9..eb0532f64e9 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-vcs-subversion.html \page creator-configuring-projects.html \nextpage creator-targets.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc index e0d4182379a..2591640a6d2 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-run.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-build-settings.html \page creator-run-settings.html \nextpage creator-editor-settings.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc index 84854aedd7a..32f27d2bc24 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-settings-sharing.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-settings-environment.html \page creator-sharing-project-settings.html \nextpage creator-project-managing-sessions.html diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc index d8db38eba64..e31a3d568a9 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-configuring-projects.html \page creator-targets.html \nextpage creator-project-qmake.html diff --git a/doc/qtcreator/src/projects/creator-projects-running.qdoc b/doc/qtcreator/src/projects/creator-projects-running.qdoc index b8cb227527a..a7d6a27f9aa 100644 --- a/doc/qtcreator/src/projects/creator-projects-running.qdoc +++ b/doc/qtcreator/src/projects/creator-projects-running.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-running-targets.html \if defined(qtdesignstudio) \previouspage studio-live-preview.html diff --git a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc index 2b266f877af..19e1217e63d 100644 --- a/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/qtcreator/src/qnx/creator-deployment-qnx.qdoc @@ -34,7 +34,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-deployment-embedded-linux.html \page creator-deployment-qnx.html \nextpage creator-connecting-mobile.html diff --git a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc index 8dce60438d9..e535c04e046 100644 --- a/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc +++ b/doc/qtcreator/src/qnx/creator-developing-qnx.qdoc @@ -29,7 +29,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-developing-mcu.html \page creator-developing-qnx.html \nextpage creator-setup-webassembly.html diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 5d20bc7c335..da35dae588c 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -25,7 +25,6 @@ /*! - \contentspage index.html \page qtcreator-toc.html \title All Topics diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index 46a55f1801a..fe5e7f81754 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage{index.html}{Qt Creator} \page index.html \nextpage creator-getting-started.html diff --git a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc index 7769b7501c7..62ad21e6031 100644 --- a/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-writing-program.html \example accelbubble \nextpage creator-project-managing.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc index f416d1bfa2d..30e78fe38a2 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-development.qdoc @@ -30,8 +30,6 @@ // ********************************************************************** /*! - - \contentspage index.html \page creator-visual-editor.html \previouspage creator-design-mode.html \nextpage quick-projects.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc index f1574af0010..03c406a0c1f 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-tutorials.html \example transitions \nextpage creator-writing-program.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc index 5cd7b328f18..322957a589a 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} \previouspage quick-property-bindings.html \page quick-connections-backend.html \nextpage quick-states.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc index b11cfce9526..4841ee2023c 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc @@ -30,8 +30,6 @@ // ********************************************************************** /*! - - \contentspage index.html \previouspage creator-visual-editor.html \page quick-projects.html \nextpage creator-using-qt-quick-designer.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc index 4a9c57e9e6c..6dd14ec3a7a 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page qtquick-iso-icon-browser.html \previouspage studio-3d-scene-environment.html \nextpage creator-qml-modules-with-plugins.html diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc index 709cadb3a81..c37643d7bbc 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-quick-ui-forms.html \page creator-qml-modules-with-plugins.html \nextpage quick-converting-ui-projects.html diff --git a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc index 044737bf74f..0bd0f8a2e96 100644 --- a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc +++ b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-live-preview-devices.html \page qt-design-viewer.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc index 9370ae848f8..3c8d73aa45f 100644 --- a/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-adding-dynamics.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page qtquick-adding-dynamics.html \previouspage creator-quick-ui-forms.html \nextpage studio-timeline.html diff --git a/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc b/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc index 0c982d6548b..2a60ec74bfe 100644 --- a/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-annotations.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} \page qtquick-annotations.html \previouspage qtquick-fonts.html \nextpage creator-quick-ui-forms.html diff --git a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc index b9f4bf2ff69..54ad29ee8a7 100644 --- a/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-buttons.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage qtquick-form-editor.html \page quick-buttons.html \nextpage quick-scalable-image.html @@ -118,8 +117,6 @@ /*! - - \contentspage index.html \previouspage quick-buttons.html \page quick-scalable-image.html \nextpage qtquick-navigator.html diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index 611dd97255e..3820b01116e 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page quick-components.html \if defined(qtdesignstudio) \previouspage quick-uis.html diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc index daee35732c6..b8ecfaab9dc 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} \page quick-property-bindings.html \previouspage quick-dynamic-properties.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc index 1473007a547..9c05d2524c5 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-properties.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage quick-signals.html \page quick-dynamic-properties.html \nextpage quick-property-bindings.html diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc index a9e221ce73e..2a641741857 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-signals.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} \previouspage qmldesigner-connections.html \page quick-signals.html \nextpage quick-dynamic-properties.html diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc index d3cefb7699b..5c8cba4870c 100644 --- a/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage studio-timeline.html \page qmldesigner-connections.html \nextpage quick-signals.html diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc index e47d39dee49..ec1388ca331 100644 --- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-using-qt-quick-designer.html \if defined(qtdesignstudio) \previouspage creator-modes.html diff --git a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc index 081de128623..640e4372a08 100644 --- a/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-fonts.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \previouspage qtquick-properties.html \page qtquick-fonts.html \nextpage qtquick-annotations.html diff --git a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc index 37a31cc4be9..3d963cf7dda 100644 --- a/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-form-editor.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page qtquick-form-editor.html \previouspage quick-components.html \nextpage quick-buttons.html @@ -34,6 +33,26 @@ You design applications in the \uicontrol {Form Editor} by placing items into it. + \image qmldesigner-form-editor.png "Form Editor view" + + \section1 Resizing Items + + When you select items in the \uicontrol {Form Editor}, selection handles + appear around their edges and in their corners. You can drag the selection + handles to resize items. + + \if defined(qtdesignstudio) + To have the resizing done from the center of the selected item instead from + its edges, press \key Alt. + + To preserve the image aspect ratio while resizing when using the corner + handles, press \key Shift. This also works on items that are anchored + using left, right, top, or bottom anchors. + + To both resize from the center of the item and preserve the aspect ratio, + press \key Alt+Shift. + \endif + \section1 Snapping to Parent and Sibling Items When you are working on a design, you can use snapping to align @@ -61,16 +80,6 @@ To hide them, select the \inlineimage boundingrect.png button. - \section1 Selecting Items - - When you point the mouse to overlapping items, the frontmost item is - selected by default. However, items that do not have any content, such as - the mouse area, are typically located in front of items that do have - content, such as rectangles or border images. To select items with content - by default, click the - \inlineimage qmldesigner-only-select-items-with-content.png - button. - \section1 Previewing Component Size The width and height of the root item in a QML file determine the size of @@ -89,6 +98,11 @@ \image qmldesigner-preview-size.png "Canvas width and height" + To set the initial size of the root item, select \uicontrol Tools > + \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} and + specify the item width and height in the \uicontrol {Root Item Init Size} + group. + \section1 Specifying Canvas Size To change the canvas size, select \uicontrol Tools > \uicontrol Options > diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc index 1150e1339dc..d76327ad358 100644 --- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page quick-converting-ui-projects.html \if defined(qtdesignstudio) \previouspage studio-importing-designs.html diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc index ad6f61b4d0f..42ebca507d4 100644 --- a/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-desktop.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-live-preview.html \page creator-live-preview-desktop.html \nextpage creator-live-preview-devices.html diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc index 38edb191dcf..8cf7f9303fd 100644 --- a/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-live-preview-desktop.html \page creator-live-preview-devices.html \nextpage qt-design-viewer.html diff --git a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc index 48c03e8a55d..6d1b2d8726c 100644 --- a/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-live-preview.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \if defined(qtdesignstudio) \previouspage studio-3d-camera.html \else diff --git a/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc index 5ae3344d4f9..e1091481d32 100644 --- a/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-navigator.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} \page qtquick-navigator.html \previouspage quick-scalable-image.html \nextpage qtquick-properties.html diff --git a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc index a3e8f875c04..066afdde989 100644 --- a/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-pathview-editor.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page qmldesigner-pathview-editor.html \previouspage quick-states.html \nextpage studio-3d.html diff --git a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc index 1e126a35fd2..3e0d228cb6c 100644 --- a/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-profiler.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-qml-performance-monitor.html \if defined(qtdesignstudio) \previouspage creator-qml-debugging-example.html diff --git a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc index 95282b046eb..cdba49811cd 100644 --- a/doc/qtcreator/src/qtquick/qtquick-properties.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-properties.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page qtquick-properties.html \previouspage qtquick-navigator.html \nextpage qtquick-fonts.html diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc index 27c287bb584..d670fb21b5a 100644 --- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} \page quick-states.html \if defined(qtdesignstudio) \previouspage quick-property-bindings.html diff --git a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc index 1fae55bb9a4..9fb9baa0c1b 100644 --- a/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-timeline.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage qtquick-adding-dynamics.html \page studio-timeline.html \nextpage qmldesigner-connections.html diff --git a/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc index 834bc605f78..be781e11dcb 100644 --- a/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-indenting-code.html \page qt-quick-toolbars.html \if defined(qtdesignstudio) diff --git a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc index 14bb305be16..3d243c95713 100644 --- a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc @@ -30,8 +30,6 @@ // ********************************************************************** /*! - - \contentspage index.html \page creator-quick-ui-forms.html \previouspage qtquick-annotations.html \nextpage qtquick-adding-dynamics.html diff --git a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc index 198949974b3..e681a32bc0b 100644 --- a/doc/qtcreator/src/qtquick/qtquick-uis.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-uis.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page quick-uis.html \if defined(qtdesignstudio) \previouspage quick-converting-ui-projects.html @@ -52,9 +51,10 @@ While it is useful to learn the basics of Qt Quick, you can also rely on \QMLD to write the code for you when you drag-and-drop the ready-made - components to the working area and change them to your liking by modifying - their properties in the Design mode. You can always check up details in - the extensive Qt Quick documentation by pressing \key F1. + components to the \uicontrol {Form Editor} view and change them to your + liking by modifying their properties in the \uicontrol Properties view in + the Design mode. You can always check up details in the extensive Qt Quick + documentation by pressing \key F1. \list diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc index 5142dc26865..420b1800c58 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-bazaar.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-version-control.html \page creator-vcs-bazaar.html \nextpage creator-vcs-clearcase.html diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc index 7fea2ced5a3..4518acc43ef 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-clearcase.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-vcs-bazaar.html \page creator-vcs-clearcase.html \nextpage creator-vcs-cvs.html diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc index 030fd73240e..9db5e06cd29 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-cvs.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-vcs-clearcase.html \page creator-vcs-cvs.html \nextpage creator-vcs-git.html diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc index 9c0abaf98e6..244cb995a8b 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-mercurial.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-vcs-git.html \page creator-vcs-mercurial.html \nextpage creator-vcs-perforce.html diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc index f84aef760de..8c59e3626db 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-perforce.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-vcs-mercurial.html \page creator-vcs-perforce.html \nextpage creator-vcs-subversion.html diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc index 900f5a3b6fc..a84f6450534 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs-subversion.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-vcs-perforce.html \page creator-vcs-subversion.html \nextpage creator-configuring-projects.html diff --git a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc index 3dfc772b45e..03e1c03c1e3 100644 --- a/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc +++ b/doc/qtcreator/src/vcs/creator-only/creator-vcs.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-project-wizards.html \page creator-version-control.html \nextpage creator-vcs-bazaar.html diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 732ba80597b..b337215a79d 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \page creator-vcs-git.html \if defined(qtdesignstudio) \previouspage studio-projects.html diff --git a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc index 6fa120ee963..811cb32d1e3 100644 --- a/doc/qtcreator/src/webassembly/creator-webassembly.qdoc +++ b/doc/qtcreator/src/webassembly/creator-webassembly.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-developing-qnx.html \page creator-setup-webassembly.html \nextpage creator-build-process-customizing.html diff --git a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc index ae76170d450..a28111f574c 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-app-tutorial.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage {Creating a Qt Quick Application} \page creator-writing-program.html \nextpage {Creating a Mobile Application} diff --git a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc index ba406bb8d9e..915765c2b0d 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-overview.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage quick-converting-ui-projects.html \page creator-using-qt-designer.html \nextpage adding-plugins.html diff --git a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc index 1e43501b631..7c247d457ef 100644 --- a/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc +++ b/doc/qtcreator/src/widgets/qtdesigner-plugins.qdoc @@ -30,7 +30,6 @@ // ********************************************************************** /*! - \contentspage index.html \previouspage creator-using-qt-designer.html \page adding-plugins.html \nextpage creator-usability.html diff --git a/doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject b/doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject new file mode 100644 index 00000000000..94dd80cfdc3 --- /dev/null +++ b/doc/qtdesignstudio/examples/clustertutorial/ClusterTutorial.qmlproject @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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 QmlProject 1.1 + +Project { + mainFile: "ClusterTutorial.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + + JavaScriptFiles { + directory: "." + } + + ImageFiles { + directory: "." + } + + Files { + filter: "*.conf" + files: ["qtquickcontrols2.conf"] + } + + Files { + filter: "qmldir" + directory: "." + } + + Environment { + QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" + QT_AUTO_SCREEN_SCALE_FACTOR: "1" + } + + /* List of plugin directories passed to QML runtime */ + importPaths: [ "imports", "backend"] + + /* Required for deployment */ + targetDirectory: "/opt/ClusterTutorial" +} diff --git a/doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml b/doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml new file mode 100644 index 00000000000..eaeffa83e78 --- /dev/null +++ b/doc/qtdesignstudio/examples/coffeemachine/ApplicationFlow.qml @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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.4 +import CoffeeMachine 1.0 + +ApplicationFlowForm { + id: applicationFlow + state: "initial" + + property int animationDuration: 400 + + choosingCoffee.brewButtonSelection.onClicked: { + applicationFlow.state = "to settings" + applicationFlow.choosingCoffee.milkSlider.value = applicationFlow.choosingCoffee.sideBar.currentMilk + applicationFlow.choosingCoffee.sugarSlider.value = 2 + } + + choosingCoffee.sideBar.onCoffeeSelected: { + applicationFlow.state = "selection" + } + + choosingCoffee.backButton.onClicked: { + applicationFlow.state = "back to selection" + } + + choosingCoffee.brewButton.onClicked: { + applicationFlow.state = "to empty cup" + } + + emptyCup.continueButton.onClicked: { + applicationFlow.state = "to brewing" + brewing.coffeeName = choosingCoffee.sideBar.currentCoffee + brewing.foamAmount = choosingCoffee.sideBar.currentFoam + brewing.milkAmount = applicationFlow.choosingCoffee.milkSlider.value + brewing.coffeeAmount = choosingCoffee.sideBar.currentCoffeeAmount + brewing.start() + } + + brewing.onFinished: { + applicationFlow.state = "reset" + } + +} diff --git a/doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml b/doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml new file mode 100644 index 00000000000..d2d9e858730 --- /dev/null +++ b/doc/qtdesignstudio/examples/coffeemachine/CoffeeButton.qml @@ -0,0 +1,159 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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.4 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.3 +import CoffeeMachine 1.0 + +Image { + id: root + source: "images/icons/coffees/Cappuccino.png" + signal clicked + + property int duration: 250 + property alias text: label.text +//! [0] + MouseArea { + anchors.fill: parent + onClicked: root.clicked() + onPressed: { + glow.visible = true + animation1.start() + animation2.start() + } + } +//! [0] + + Rectangle { + id: glow + visible: false + + width: 250 + height: 250 + color: "#00000000" + radius: 125 + scale: 1.05 + border.color: "#ffffff" + } + + Label { + id: label + x: 292 + y: 252 + text: qsTr("Label") + anchors.horizontalCenter: parent.horizontalCenter + color: "#443224" + font.family: Constants.fontFamily + font.pixelSize: 28 + } + + PropertyAnimation { + target: glow + id: animation1 + duration: root.duration + loops: 1 + from: 1.05 + to: 1.2 + property: "scale" + } + + ParallelAnimation { + id: animation2 + SequentialAnimation { + PropertyAnimation { + target: glow + duration: root.duration + loops: 1 + from: 0.2 + to: 1.0 + property: "opacity" + } + PropertyAnimation { + target: glow + duration: root.duration + loops: 1 + from: 1.0 + to: 0.0 + property: "opacity" + } + + PropertyAction { + target: glow + property: "visible" + value: false + } + } + + SequentialAnimation { + PropertyAction { + target: glow + property: "border.width" + value: 20 + } + + PauseAnimation { + duration: 200 + } + + PropertyAnimation { + target: glow + duration: root.duration + loops: 1 + from: 20 + to: 10 + property: "border.width" + } + } + } + + + +} diff --git a/doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject b/doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject new file mode 100644 index 00000000000..8a2ecfb6afe --- /dev/null +++ b/doc/qtdesignstudio/examples/coffeemachine/CoffeeMachine.qmlproject @@ -0,0 +1,89 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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 QmlProject 1.1 + +Project { + mainFile: "CoffeeMachine.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + + JavaScriptFiles { + directory: "." + } + + ImageFiles { + directory: "." + } + + Files { + filter: "*.conf" + files: ["qtquickcontrols2.conf"] + } + + Files { + filter: "qmldir" + directory: "." + } + + Environment { + QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" + QT_AUTO_SCREEN_SCALE_FACTOR: "1" + } + + /* List of plugin directories passed to QML runtime */ + importPaths: [ "imports" ] + + /* Required for deployment */ + targetDirectory: "/opt/CoffeeMachine" +} diff --git a/doc/qtdesignstudio/examples/coffeemachine/SideBar.qml b/doc/qtdesignstudio/examples/coffeemachine/SideBar.qml new file mode 100644 index 00000000000..241f78fc47f --- /dev/null +++ b/doc/qtdesignstudio/examples/coffeemachine/SideBar.qml @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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.4 + +SideBarForm { + id: sideBar + property string currentCoffee: qsTr("Cappuccino") + signal coffeeSelected + property real currentFoam: 1 + property real currentMilk: 0 + property real currentCoffeeAmount: 4 + + Behavior on currentMilk { + NumberAnimation { duration: 250 } + } + + Behavior on currentCoffeeAmount { + NumberAnimation { duration: 250 } + } + + macchiatoButton.onClicked: { + sideBar.currentCoffee = qsTr("Macchiato") + sideBar.currentFoam = 1 + sideBar.currentMilk = 1 + sideBar.currentCoffeeAmount = 4 + sideBar.coffeeSelected() + } + + latteButton.onClicked: { + sideBar.currentCoffee = qsTr("Latte") + sideBar.currentFoam = 1 + sideBar.currentMilk = 10 + sideBar.currentCoffeeAmount = 3 + sideBar.coffeeSelected() + } + + espressoButton.onClicked: { + sideBar.currentCoffee = qsTr("Espresso") + sideBar.currentFoam = 0 + sideBar.currentMilk = 0 + sideBar.currentCoffeeAmount = 4 + sideBar.coffeeSelected() + } + + cappuccinoButton.onClicked: { + sideBar.currentCoffee = qsTr("Cappuccino") + sideBar.currentFoam = 1 + sideBar.currentMilk = 7 + sideBar.currentCoffeeAmount = 3.5 + sideBar.coffeeSelected() + } +} diff --git a/doc/qtdesignstudio/examples/doc/clustertutorial.qdoc b/doc/qtdesignstudio/examples/doc/clustertutorial.qdoc new file mode 100644 index 00000000000..ce93c7bae2c --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/clustertutorial.qdoc @@ -0,0 +1,50 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \example ClusterTutorial + \ingroup studioexamples + \brief Contains sources for the Cluster Tutorial videos. + + \title Cluster Tutorial + + \e {Cluster Tutorial} example contains the source files for a set of + video tutorials that explain how to export designs from Adobe + Photoshop to \QDS and to edit them to create Qt Quick UIs. + + Select the \uicontrol Tutorials tab in the Welcome mode to watch the + following tutorials: + + \list + \li Part 1 provides an introduction to \QDS and \QB Adobe Photoshop + exporter. + \li Part 2 describes adding custom fonts and getting started with the + timeline. + \li Part 3 describes creating animations, applying effects, and using + ISO icons. + \li Part 4 describes using bindings and mock data. + \li Part 5 describes states, animation, and easing curves. + \endlist +*/ diff --git a/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc b/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc new file mode 100644 index 00000000000..7742b7eba46 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/coffeemachine.qdoc @@ -0,0 +1,175 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \example CoffeeMachine + \ingroup studioexamples + + \title Coffee Machine + \brief Illustrates how to use the timeline and states to animate transitions + in a UI. + + \image coffee-machine-overview.png + + \e {Coffee Machine} lets users choose the type of coffee to brew. + They can determine the ratio of coffee, hot milk, and milk foam by using + sliders. The progress of the brewing process is displayed as + an animation. When the coffee is ready, the startup screen appears again. + + The \e {ApplicationFlow.ui.qml} file contains all the screens in the + UI. We use states to display the appropriate screen in the + viewport and the timeline to animate the transitions between and on + the screens. + + \section1 Application Flow + + On the startup screen, \e {AnimationFlowForm.ui.qml}, users can select + from several types of coffee to fill the empty cup. The selection + triggers \c animation1 and \c animation2 in \e {CoffeeButton.qml}. + + \quotefromfile CoffeeMachine/CoffeeButton.qml + \skipto PropertyAnimation + \printuntil } + \printuntil } + \dots + + Selecting the coffee type triggers the respective signal handler in + \e {SideBar.qml}, which sets the default mix for the selected coffee type. + The following code snippet displays the \c {cappuccinoButton.onClicked()} + signal handler: + + \quotefromfile CoffeeMachine/SideBar.qml + \skipto cappuccinoButton.onClicked + \printuntil } + + The \c {sideBar.coffeeSelected()} signal sets \c {applicationFlow.state} + in \e {ApplicationFlow.qml} to \c "selection". We will specify the states + later. + + \quotefromfile CoffeeMachine/ApplicationFlow.qml + \skipto choosingCoffee.sideBar.onCoffeeSelected + \printuntil } + + \image coffee-machine-selection.png + + Clicking \uicontrol {Brew me a cup} triggers the + \c {choosingCoffee.brewButtonSelection.onClicked} + signal handler, which changes the application flow + state to \c {"to settings"}: + + \quotefromfile CoffeeMachine/ApplicationFlow.qml + \skipto choosingCoffee.brewButtonSelection.onClicked + \printuntil } + + Users can use the sliders for the amount of milk and + sugar to change the default values. + + \image coffee-machine-modify.png + + Clicking \uicontrol Brew triggers the + \c {choosingCoffee.brewButton.onClicked()} + signal handler, which sets the application + flow state to \c {"to empty cup"}. + + \skipto choosingCoffee.brewButton.onClicked + \printuntil } + + \image coffee-machine-emptycup.png + + Clicking on \uicontrol Continue triggers the + \c {emptyCup.continueButton.onClicked} signal + handler, which sets the application flow status + to \c {"to brewing"}. + + \skipto emptyCup.continueButton.onClicked + \printuntil } + + When the coffee is ready, the \c {brewing.onFinished} signal handler + is triggered. It sets the application flow status to \c "reset", so + that the application returns to the startup screen. + + \section1 Using Timelines to Animate Transitions + + The Coffee Machine application screens for choosing coffee, empty cup, and + brewing each use custom QML types specified in separate QML files. + + We use the \uicontrol Timeline view to animate the transitions between + the screens during the application flow in \e {ApplicationFlow.ui.qml}. + + \image coffee-machine-timeline.png + + Our viewport contains 200 frames, so we select the + \inlineimage plus.png "Plus button" + button to add a 1200-frame timeline to the root element. + We use the default values for all other fields. + + To start recording the transition from the startup screen to the coffee + selection screen on the timeline, we select \e choosingCoffee in the + \uicontrol Navigator. We check that the playhead is at frame 0, and then + select the \inlineimage recordfill.png + (\uicontrol {Auto Key (K)}) button (or press \key k). + + At frame 0, we set the X coordinate to 0 in \uicontrol Properties > + \uicontrol Geometry > \uicontrol Position. We then move the playhead + to 400 frames and set the X coordinate to a negative value. + + \image coffee-machine-properties.png + + When we deselect the record button to stop recording the timeline, the + new timeline appears in the view. + + For more information about using the timeline, see \l {Creating Animations}. + + \section1 Using States to Move Between Screens + + We use the \uicontrol States view to determine the contents of the + viewport. The animations are run when moving from one state to another. + + \image coffee-machine-states.png + + We create the states by moving from viewport to viewport in + \e ApplicationFlow.ui.qml and clicking \inlineimage plus.png "Add button" + in the \uicontrol States view. + + We also create states for animations that are run when moving to the + \c {"settings"} and \c {"selection"} states. + + We then return to the \uicontrol Timeline view and select + \inlineimage animation.png "Timeline Settings button" + to open the \uicontrol {Timeline Settings} dialog. We select + the \uicontrol Add button to create animations for each part + of the timeline. Therefore, the start and end frame of each + animation are important, whereas their duration is not. + + \image coffee-machine-timeline-settings.png + + We set the start frame for the \c {"selection"} state to 400 and + the end frame to 200, because we are moving back on the timeline to display + the selection sidebar. + + In the \uicontrol {Transitions to states} field, we select the state to + switch to when the animation ends. In the lower part of the dialog, we + bind the states that don't have animations to fixed frames. +*/ diff --git a/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc b/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc new file mode 100644 index 00000000000..a6d95b07b06 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/ebikedesign.qdoc @@ -0,0 +1,129 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \example EBikeDesign + \ingroup studioexamples + + \title E-Bike Design + \brief Illustrates how to use the timeline and states to animate transitions + in an application. + + \image ebikedesign.png "Standard screen" + + \e {E-Bike Design} is a control center application for electric bikes. + The application contains a Standard screen that displays a speedometer, + a Trip screen that displays statistics about the current trip, and a + Navigator screen that displays a map. + + The Trip and Navigator screens display a small animated speedometer that + the users can select to move back to the Standard screen. + + \image ebikedesign-trip.png "Trip screen" + + In the \e {Screen01.ui.qml} file, we place the screens in a row in the + following order from left to right: Trip, Standard, Navigator. We will + use states to show the appropriate screen in the viewport, and the timeline + to animate the transitions between and on the screens. + + \section1 Using Timelines to Animate Transitions + + We use the \uicontrol Timeline view to animate the transitions between + the screens in \e {Screen01.ui.qml}. + + Our viewport contains 1000 frames, so we select the + \inlineimage plus.png "Plus button" + button to add a 5000-frame timeline to the root element. + We use the default values for all other fields. + + To start recording the transitions between the Standard screen and the + Trip and Navigator screens on the timeline, we select \e screenCanvas in + the Design mode \uicontrol Navigator view. We check that the playhead is at + frame 0, and then select the \inlineimage recordfill.png + (\uicontrol {Auto Key (K)}) button (or press \key k). + + \image ebikedesign-timeline.png "Timeline view" + + At frame 0, we set the X coordinate to 0 in \uicontrol Properties > + \uicontrol Geometry > \uicontrol Position to display the Trip screen. + We then move the playhead to frame 1000 and set the X coordinate to + -1286 to display the Standard screen. We continue by moving the playhead + to frame 2000 and setting the X coordinate to -2560 to display the + Navigator screen. At frame 3000, we set the X coordinate back to -1268 + to return to the Standard screen. Finally, at frame 4000, we set the X + coordinate to -19 to return to the Trip screen. + + When we deselect the record button to stop recording the timeline, the + new timeline appears in the view. + + When we select \e tripScreen in the \uicontrol Navigator, we can see the + properties of the TripScreen QML type that we can animate in the + \uicontrol Properties view. + + \image ebikedesign-trip-properties.png "Properties view of the Trip type" + + We set values for the \uicontrol Visibility, + \uicontrol Opacity, \uicontrol currentFrame, and \uicontrol Scale properties + to fade out the current screen when moving to another one and to make the + speedometer grow and shrink in size depending on its current position. + + For more information about using the timeline, see \l {Creating Animations}. + + \section1 Using States to Move Between Screens + + We use the \uicontrol States view to determine the contents of the viewport. + The animations are run in a particular state or when moving from one state + to another. + + \image ebikedesign-states.png "States view" + + We create the states for displaying the Trip, Standard, and Navigation + screens by moving from viewport to viewport in \e Screen01.ui.qml and + clicking \inlineimage plus.png "Add button" in the \uicontrol States view + when the appropriate screen is displayed in the viewport. + + We then create states for animations that are run when moving between the + screens: TripToStandard, StandardToNavigation, NavigationToStandard, and + StandardToTrip. + + Finally, we create states for enlarging and shrinking the speedometer: Big, + ToBig, and FromBig. + + We then return to the \uicontrol Timeline view and select + \inlineimage animation.png "Timeline Settings button" + to open the \uicontrol {Timeline Settings} dialog. We select + the \uicontrol Add button to create animations for each part + of the timeline. Therefore, the start and end frame of each + animation are important, whereas their duration is not. + + \image ebikedesign-timeline-settings.png "Timeline Settings dialog" + + We set the start and end frames for the transitions to states to match the + values of the X coordinate we set on the timeline. + + In the \uicontrol {Transitions to states} field, we select the state to + switch to when the animation ends. In the lower part of the dialog, we + bind the states that don't have animations to fixed frames. +*/ diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-emptycup.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-emptycup.png Binary files differnew file mode 100644 index 00000000000..aa791ccd0e2 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-emptycup.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-modify.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-modify.png Binary files differnew file mode 100644 index 00000000000..e1977821aaf --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-modify.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-overview.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-overview.png Binary files differnew file mode 100644 index 00000000000..3a8c069a557 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-overview.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-properties.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-properties.png Binary files differnew file mode 100644 index 00000000000..0cff9dbf835 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-properties.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-selection.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-selection.png Binary files differnew file mode 100644 index 00000000000..810857ed7b9 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-selection.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-states.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-states.png Binary files differnew file mode 100644 index 00000000000..c21007a43ce --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-timeline-settings.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-timeline-settings.png Binary files differnew file mode 100644 index 00000000000..bf08d8ef73a --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-timeline-settings.png diff --git a/doc/qtdesignstudio/examples/doc/images/coffee-machine-timeline.png b/doc/qtdesignstudio/examples/doc/images/coffee-machine-timeline.png Binary files differnew file mode 100644 index 00000000000..3f3d7d9e07e --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/coffee-machine-timeline.png diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png Binary files differnew file mode 100644 index 00000000000..a215700d6bf --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign-timeline-settings.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign-timeline-settings.png Binary files differnew file mode 100644 index 00000000000..f0ba42d9c53 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-timeline-settings.png diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign-timeline.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign-timeline.png Binary files differnew file mode 100644 index 00000000000..934d874e337 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-timeline.png diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign-trip-properties.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign-trip-properties.png Binary files differnew file mode 100644 index 00000000000..6c63f3d981f --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-trip-properties.png diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign-trip.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign-trip.png Binary files differnew file mode 100644 index 00000000000..9de59c0132e --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign-trip.png diff --git a/doc/qtdesignstudio/examples/doc/images/ebikedesign.png b/doc/qtdesignstudio/examples/doc/images/ebikedesign.png Binary files differnew file mode 100644 index 00000000000..c517c4b56b9 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/ebikedesign.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-animated.png b/doc/qtdesignstudio/examples/doc/images/progressbar-animated.png Binary files differnew file mode 100644 index 00000000000..7a9a9d38a40 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-animated.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-bindings-progress.png b/doc/qtdesignstudio/examples/doc/images/progressbar-bindings-progress.png Binary files differnew file mode 100644 index 00000000000..5e891100a63 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-bindings-progress.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-move-component.png b/doc/qtdesignstudio/examples/doc/images/progressbar-move-component.png Binary files differnew file mode 100644 index 00000000000..a9c7008a156 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-move-component.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-rectangle.png b/doc/qtdesignstudio/examples/doc/images/progressbar-rectangle.png Binary files differnew file mode 100644 index 00000000000..208e5ffe18a --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-rectangle.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-root-export-property.png b/doc/qtdesignstudio/examples/doc/images/progressbar-root-export-property.png Binary files differnew file mode 100644 index 00000000000..98e07161db1 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-root-export-property.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-indicator-color.png b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-indicator-color.png Binary files differnew file mode 100644 index 00000000000..417e3bb0291 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-indicator-color.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-indicator.png b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-indicator.png Binary files differnew file mode 100644 index 00000000000..4466876b7ed --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-indicator.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-settings.png b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-settings.png Binary files differnew file mode 100644 index 00000000000..64862dbbd0e --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline-settings.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar-timeline.png b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline.png Binary files differnew file mode 100644 index 00000000000..ad644d4bb5d --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar-timeline.png diff --git a/doc/qtdesignstudio/examples/doc/images/progressbar.png b/doc/qtdesignstudio/examples/doc/images/progressbar.png Binary files differnew file mode 100644 index 00000000000..dfae54abc69 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/progressbar.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-connections.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-connections.png Binary files differnew file mode 100644 index 00000000000..7251ddd0512 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-connections.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-property-bindings.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-property-bindings.png Binary files differnew file mode 100644 index 00000000000..a89921dc8ee --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-property-bindings.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png Binary files differnew file mode 100644 index 00000000000..950058c5d82 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-custombutton-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-effects-stack.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-effects-stack.png Binary files differnew file mode 100644 index 00000000000..9e3796fad46 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-effects-stack.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-menubar.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-menubar.png Binary files differnew file mode 100644 index 00000000000..bdb3a314715 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-menubar.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png Binary files differnew file mode 100644 index 00000000000..6a8adb64aa7 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-timeline-settings.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-timeline-settings.png Binary files differnew file mode 100644 index 00000000000..236f1f409a5 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-timeline-settings.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-timeline.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-timeline.png Binary files differnew file mode 100644 index 00000000000..9548ddc087e --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-timeline.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu-ui.png b/doc/qtdesignstudio/examples/doc/images/sidemenu-ui.png Binary files differnew file mode 100644 index 00000000000..d99e4e11d92 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu-ui.png diff --git a/doc/qtdesignstudio/examples/doc/images/sidemenu.png b/doc/qtdesignstudio/examples/doc/images/sidemenu.png Binary files differnew file mode 100644 index 00000000000..d1c1cd750be --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/sidemenu.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png Binary files differnew file mode 100644 index 00000000000..32a40a8de52 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-blureffect.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png Binary files differnew file mode 100644 index 00000000000..29d39c82678 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-mainappui.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-fastblur.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-fastblur.png Binary files differnew file mode 100644 index 00000000000..5fd69e6f250 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-fastblur.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-layoutref.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-layoutref.png Binary files differnew file mode 100644 index 00000000000..b7d7b1e1148 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-layoutref.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-stacklayout.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-stacklayout.png Binary files differnew file mode 100644 index 00000000000..3cb90b1a1a1 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-qb-stacklayout.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png Binary files differnew file mode 100644 index 00000000000..83755e876a5 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-states.png diff --git a/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png b/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png Binary files differnew file mode 100644 index 00000000000..c6c0976eeda --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/images/webinardemo-timeline.png diff --git a/doc/qtdesignstudio/examples/doc/loginui1.qdoc b/doc/qtdesignstudio/examples/doc/loginui1.qdoc index 3be68658aa2..a33f9862006 100644 --- a/doc/qtdesignstudio/examples/doc/loginui1.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui1.qdoc @@ -78,9 +78,8 @@ \section2 Learn Qt Quick - Projects and Files \QDS creates a set of boilerplate files and folders that you need to create - a UI using Qt Quick and QML. The files are listed in the \uicontrol Project - tab in the \uicontrol Navigator and in the \uicontrol Projects view. For - more information, see \l {Viewing Project Files}. + a UI using Qt Quick and QML. The files are listed in the \uicontrol Projects + view. For more information, see \l {Viewing Project Files}. \image loginui1-project-files.png @@ -108,9 +107,8 @@ QML files define a hierarchy of objects with a highly-readable, structured layout. Every QML file consists of two parts: an imports section and an object declaration section. The QML types and functionality most common to - UIs are provided in the QtQuick import. Select the \uicontrol {Text Editor} - tab in the Design mode or press \key F4 to view the QML code of an ui.qml - file. + UIs are provided in the QtQuick import. You can view the QML code of an + ui.qml file in the \uicontrol {Text Editor} view. For more information about creating a QML file from scratch, see \l{First Steps with QML}. @@ -127,17 +125,21 @@ To preview the changes that you make to the UI while you make them, select the \inlineimage live_preview.png - (\uicontrol {Show Live Preview}) button on the canvas toolbar - or press \key {Alt+P}. + (\uicontrol {Show Live Preview}) button on the \uicontrol {Form Editor} + view toolbar or press \key {Alt+P}. The \e Screen01.ui.qml file that the wizard created for you should be open in the Design mode. If it is not, you can double-click it in the - \uicontrol Project sidebar view to open it. + \uicontrol Projects view to open it. - To modify \e Screen01.ui.qml in the \uicontrol {Form Editor} tab: + \note The visibility of views depends on the selected workspace. To open + hidden views, select \uicontrol Window > \uicontrol Views in the Design + mode. For more information, see \l {Managing Workspaces}. + + To modify \e Screen01.ui.qml in the \uicontrol {Form Editor}: \list 1 - \li Select \e Rectangle in the \uicontrol Navigator to display its + \li Select \e Rectangle in the \uicontrol Navigator view to display its properties in the \uicontrol Properties view. \li In the \uicontrol Color field, select the \inlineimage icons/action-icon-binding.png @@ -182,7 +184,7 @@ \skipto import \printuntil loginui1 1.0 - The \uicontrol Library lists the QML types in each Qt module that are + The \uicontrol Library view lists the QML types in each Qt module that are supported by \QDS. You can use the basic types to create your own QML types, and they will be listed in the \uicontrol {My QML Components} tab. The tab is only visible if you have created custom QML components. @@ -196,8 +198,8 @@ You can use another wizard to create a push button and to add it to the project. The wizard creates a reusable button component that appears in the \uicontrol {My QML Components} tab in the \uicontrol Library. You can - drag and drop it to the canvas and modify its properties to change its - appearance and functionality. + drag and drop it to the \uicontrol {Form Editor} and modify its properties + in the \uicontrol Properties view to change its appearance and functionality. If you find that you cannot use the wizard to create the kind of push button that you want, you can create your button from scratch using basic @@ -269,8 +271,8 @@ \li On the toolbar, select \uicontrol Master > \uicontrol buttonBackground to move into the button background component. - \li Select the button background on the canvas or in the - \uicontrol Navigator to display its properties in the + \li Select the button background in the \uicontrol {Form Editor} or + in the \uicontrol Navigator to display its properties in the \uicontrol Properties view. \li In the \uicontrol Color field, select \inlineimage icons/action-icon.png @@ -290,14 +292,15 @@ to save your changes. \endlist - To move back to the top level PushButton type on the canvas, select + To move back to the top level PushButton type in the + \uicontrol {Form Editor}, select \uicontrol PushButton.ui.qml on the breadcrumb bar (1): \image loginui1-breadcrumb-bar.png "Breadcrumb bar in the Design mode." Your button should now look something like this: - \image loginui1-button-styled.png "Modified button in the Design mode." + \image loginui1-button-styled.png "Modified button in the Form Editor" \section2 Learn Qt Quick - Property Bindings @@ -327,11 +330,11 @@ You will now add two button instances to the UI and modify their labels. \list 1 - \li Double-click \e Screen01.ui.qml in the \uicontrol Project sidebar - view to open it on the canvas. + \li Double-click \e Screen01.ui.qml in the \uicontrol Projects + view to open it in the \uicontrol {Form Editor}. \li Drag and drop two instances of the PushButton type from the - \uicontrol Library to the canvas. - \image loginui1-library.png "Library sidebar view" + \uicontrol Library to the \uicontrol {Form Editor}. + \image loginui1-library.png "Library view" \li Select one of the buttons in the \uicontrol Navigator to modify its id and text label in the \uicontrol Properties view. \li In the \uicontrol Id field, enter \e loginButton. @@ -347,9 +350,9 @@ buttons so that the text fits comfortably on the button background. In this example, the button width is set to 120 pixels. \li Move the cursor on the selected button to make the selection icon - appear. You can now drag the button to another position on the - canvas. Use the guidelines to align the buttons below the page - title: + appear. You can now drag the button to another position in the + \uicontrol {Form Editor}. Use the guidelines to align the buttons + below the page title: \image loginui1-align-buttons.png \li Select \uicontrol File > \uicontrol Save or press \key {Ctrl+S} to save your changes. diff --git a/doc/qtdesignstudio/examples/doc/loginui2.qdoc b/doc/qtdesignstudio/examples/doc/loginui2.qdoc index 908c50ee513..cbc66af9de9 100644 --- a/doc/qtdesignstudio/examples/doc/loginui2.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui2.qdoc @@ -53,8 +53,8 @@ \section1 Anchoring UI Components - First, you will add a new rectangle to the canvas and move all the - current UI components to it to create a new page. Then, you will + First, you will add a new rectangle to the \uicontrol {Form Editor} and move + all the current UI components to it to create a new page. Then, you will \l {Setting Anchors and Margins}{anchor} the static elements on the page, that is the logo image (\e logo) and page title (\e pageTitle), to the page. When you created the project using the new project wizard @@ -65,20 +65,20 @@ To preview the changes that you make to the UI while you make them, select the \inlineimage live_preview.png - (\uicontrol {Show Live Preview}) button on the canvas toolbar - or press \key {Alt+P}. + (\uicontrol {Show Live Preview}) button on the \uicontrol {Form Editor} + toolbar or press \key {Alt+P}. To anchor components on a page: \list 1 \li Open \e {Screen01.ui.qml} for editing in the Design mode - \uicontrol {Form Editor} tab. + \uicontrol {Form Editor}. \li Select the rectangle that forms the UI background in the \uicontrol Navigator, and change its id to \e root in the \uicontrol Properties view. \li Drag and drop a \uicontrol Rectangle from the \uicontrol Library to \e root, and change its id to \e loginPage. - \li In the \uicontrol Layout tab, select the \inlineimage anchor-fill.png + \li In the \uicontrol Layout view, select the \inlineimage anchor-fill.png (\uicontrol {Fill Parent Item}) button to anchor the page to the root item on all sides. \li Select all the other UI elements below \e root in the @@ -132,7 +132,7 @@ \l {Qt Quick Controls 2} types in the tab: \image loginui2-imports.png \li Drag and drop two instances of the \uicontrol {Text Field} type - to the canvas. + to the \uicontrol {Form Editor}. \li Select one of the text fields in the \uicontrol Navigator, and change its id to \e usernameField in the \uicontrol Properties view. \li In the \uicontrol Geometry group, \uicontrol Size field, set the @@ -141,8 +141,8 @@ \uicontrol tr to mark the text translatable. \image loginui2-field-properties.png "Text field properties" \li In the \uicontrol Text field, delete the default text to make the - placeholder text visible on the canvas. The text value always takes - precedence over the placeholder text value. + placeholder text visible on the \uicontrol {Form Editor}. The text + value always takes precedence over the placeholder text value. \li Select the other text field, and change its id to \e passwordField, placeholder text to \e Password, and width to \e 300 pixels. Also remove the default text. @@ -155,7 +155,8 @@ \uicontrol Navigator, and right-click on either item to open a context menu. \li Select \uicontrol Position > \uicontrol {Position in Column} - to position the fields on top of each other on the canvas. + to position the fields on top of each other in the + \uicontrol {Form Editor}. \li Select the column in the \uicontrol Navigator and change its id to \e fieldColumn in \uicontrol Properties. \li In the \uicontrol Spacing field, set the spacing between the diff --git a/doc/qtdesignstudio/examples/doc/loginui3.qdoc b/doc/qtdesignstudio/examples/doc/loginui3.qdoc index e4b143a7a6f..b09e9d9a0ab 100644 --- a/doc/qtdesignstudio/examples/doc/loginui3.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui3.qdoc @@ -63,8 +63,8 @@ To preview the changes that you make to the UI while you make them, select the \inlineimage live_preview.png - (\uicontrol {Show Live Preview}) button on the canvas toolbar - or press \key {Alt+P}. + (\uicontrol {Show Live Preview}) button on the \uicontrol {Form Editor} + toolbar or press \key {Alt+P}. To add the text field and a back button needed on the registration page: @@ -81,7 +81,7 @@ \li In the \uicontrol Placeholder field, set the placeholder text to \e {Verify password}. \li In the \uicontrol Text field, delete the default text to make the - placeholder text visible on the canvas. + placeholder text visible in the \uicontrol {Form Editor}. \li Drag and drop a PushButton type from the \uicontrol Library, \uicontrol {My QML Components} tab, to \e loginPage in the \uicontrol Navigator. @@ -114,7 +114,7 @@ \section1 Using States to Simulate Page Changes You will now add \l{Adding States}{states} to the UI to show and hide UI - components on the canvas: + components in the \uicontrol {Form Editor}: \list 1 \li In the \uicontrol States view, select the \inlineimage plus.png @@ -250,7 +250,7 @@ \li Right-click \e loginButton in the \uicontrol Navigator and select \uicontrol {Go into Component} to open \e PushButton.ui.qml for editing in the Design mode. - \li Open the \uicontrol {Text Editor} tab. + \li Open the \uicontrol {Text Editor}. \li Edit the property values for the \e down state, to set the button text color to white and the background and border colors to darker shades of green by using the \c {Qt.darker()} function: diff --git a/doc/qtdesignstudio/examples/doc/loginui4.qdoc b/doc/qtdesignstudio/examples/doc/loginui4.qdoc index 93204d05f35..e9e19eaeb9b 100644 --- a/doc/qtdesignstudio/examples/doc/loginui4.qdoc +++ b/doc/qtdesignstudio/examples/doc/loginui4.qdoc @@ -76,8 +76,8 @@ To preview the changes that you make to the UI while you make them, select the \inlineimage live_preview.png - (\uicontrol {Show Live Preview}) button on the canvas toolbar - or press \key {Alt+P}. + (\uicontrol {Show Live Preview}) button on the \uicontrol {Form Editor} + toolbar or press \key {Alt+P}. \section2 Replacing Columns with Anchors diff --git a/doc/qtdesignstudio/examples/doc/progressbar.qdoc b/doc/qtdesignstudio/examples/doc/progressbar.qdoc new file mode 100644 index 00000000000..208e97bf8df --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/progressbar.qdoc @@ -0,0 +1,237 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \example ProgressBar + \ingroup studioexamples + + \title Progress Bar + \brief Illustrates how to use timelines to create an animated progress bar. + + \image progressbar.png "Progress Bar example application" + + \e {Progress Bar} animates rectangles and numbers using timelines. + + \section1 Creating the Progress Bar + + First, we create an empty Qt Quick project, as described in + \l {Creating Projects}. For the purposes of this example, + we call the project \e progressbar. + + In this example, we use two overlapping rectangles and a text label to + create the progress bar. For another example of a progress bar, see the + \l [QtQuickControls2] {ProgressBar} in Qt Quick Controls. + + In the Design mode, we drag and drop a \uicontrol Rectangle from the + \uicontrol Library to the \uicontrol {Form Editor} and modify its size + to create the background for the progress bar. We change its id to + \e background in the \uicontrol Properties view. + + We want to be able to control the background rectangle and the text label + that was added by the project wizard, so we will use an \uicontrol Item + for that. We drag and drop the item from the \uicontrol Library to the + \uicontrol {Form Editor} and change its id to \e root in the + \uicontrol Properties view. + + To make the background and text children of the item, we drag and drop them + to the item in the \uicontrol Navigator view. This enables us to use the anchor + buttons in \uicontrol Properties > \uicontrol Layout to anchor them to their + parent. We anchor the background to its parent on all edges, with a 30-pixel + margin at the top to leave space for the text. We then anchor the text to + the top of the item. + + \image progressbar-rectangle.png "Progress bar background in the Form Editor" + + We now drag and drop another rectangle on top of the background rectangle in + the \uicontrol Navigator and change its id to \e indicator in the properties. + We then anchor the left, top, and bottom of the indicator to its parent with + 5-pixel margins. We leave the right side free, because its value needs to + change for the animation. + + For more information about creating and positioning components, see + \l {Creating Components}. + + \section1 Animating Progress Bar Elements + + The text label will indicate the progress in numbers and changing color, + while the indicator rectangle will indicate it by getting wider and + changing color. To animate the label and indicator, we'll add timelines + in the \uicontrol Timeline view. + + For more information about using the timeline, see \l {Creating Animations}. + + \section2 Adding Color Animation + + First, we add a color animation to the \e root item. We select the + \inlineimage plus.png + button to add a 100-frame timeline to root. You can use the default + values for all other fields. + + \image progressbar-timeline-settings.png "Timeline settings" + + To start recording a color animation on the timeline, we check that the + playhead is at frame 0 and then select the \inlineimage recordfill.png + (\uicontrol {Auto Key (K)}) button (or press \key k). + + \image progressbar-timeline.png "Color animation timeline" + + We then set the color at frame 0 to green (\e {#8de98d}) in + \uicontrol Properties > \uicontrol Text > \uicontrol {Text Color}. + We can either pick a color from the color selector or use the + \uicontrol {Set Binding} command in the \inlineimage submenu.png + (\uicontrol Settings) menu to open the \uicontrol {Binding Editor}. + + We then move the playhead to frame 50 and set the text color to red + (\e {#de4f4f}). Finally, we move the playhead to frame 100 and set + the color to yellow (\e {#f0c861}). + + When we deselect the record button to stop recording the timeline, the + new timeline appears in the view. + + We can drag the playhead along the timeline to see the color animation. + + \section2 Animating the Indicator + + We select \e indicator in \uicontrol Navigator and then select the record + button again to animate the width of the indicator. At frame 0, we set the + width to 0 in \uicontrol Properties > \uicontrol Geometry > \uicontrol Size. + We then move the playhead to 100 frames and set the width to 590. + + \image progressbar-timeline-indicator.png "Indicator timeline" + + We will now copy the color animation from the text label to the indicator. + First, we right-click the text item in the \uicontrol Timeline view to open + a context menu and select \uicontrol {Copy All Keyframes from Item} to copy + the keyframe values we specified for the text label. + + Next, we select the indicator in the \uicontrol Navigator, and then select + \uicontrol {Insert Keyframes for Item} to paste the keyframe + values to the indicator. + + \image progressbar-timeline-indicator-color.png "Indicator timeline with color animation" + + When we move the playhead, we can see that the color animation is also + applied to the indicator. + + \section1 Creating a Reusable Component + + We want the progress bar to be reusable, so we'll move it to a separate + QML file. To make sure that the component will contain the timeline, we + select \uicontrol {Filter Tree} in the \uicontrol Navigator, and then + deselect the \uicontrol {Show Only Visible Items} check box to show the + timeline item in the \uicontrol Navigator. We then move the timeline item + to \e root to have it moved as a part of the root component. + + Now we can right-click root to open a context menu and select + \uicontrol {Move Component into Separate File}. We can see the + properties that will be available from outside of the component. + + \image progressbar-move-component.png "Move Component into Separate File dialog" + + \section1 Exporting Properties + + We now select the root component in the \uicontrol Navigator, and + then select \uicontrol {Go into Component} in the context menu to + open \e Root.qml in the \uicontrol {Form Editor}. + + We want to be able to use the keyframe value as the value of the text label, + so we will export it as a property alias. We select \e timeline in the + \uicontrol Navigator and then \uicontrol Properties > \uicontrol Timeline > + \uicontrol {Current frame} > \uicontrol Settings > + \uicontrol {Export Property as Alias}. + + \image progressbar-root-export-property.png "Export keyframe group as a property" + + When we select \e root in the \uicontrol Navigator, we can see the + \e timelineCurrentFrame property in \uicontrol Connections + > \uicontrol Bindings. We double-click it to change its name + to \e progress. + + \image progressbar-bindings-progress.png "Connections view Bindings tab" + + We will bind some JavaScript to the value of the text label to turn + it into a running number that reflects the number of the keyframe on the + timeline. We select the text label in the \uicontrol Navigator, and then + select \uicontrol Properties > \uicontrol Text > \uicontrol {Set Binding} + to open the \uicontrol {Binding Editor}. We set + \c {Math.round(root.progress)} as the value of the text label. + + When we move back to the top-level file, we can see that the number of the + current keyframe (0) is displayed as the value of the text label. + + \section1 Animating Progress Bar Instances + + We want to experiment with different start and end values and easing curves, + so we copy-paste the progress bar instance twice in the top-level file. We + use a column layout to lay out the progress bar instances. + + We can now add timelines for each progress bar instance, with different + settings. We select the \inlineimage plus.png + button to add a 4000-frame timeline to the first progress bar instance + (\e root). We select the \uicontrol Continuous check box, so that the + animation will loop. + + In \uicontrol Properties > \uicontrol Root, we can see the + \uicontrol progress property that we can animate. If we had + called the component and property something else, we would + see the names we gave them here. + + With the playhead in the first frame, we select the record button and + give the \uicontrol progress property the initial value of \e 5. We then + move the playhead to frame 2000 and give it the value of \e 95. We + continue to the last frame and set the value back to \e 5 to have a + smooth looping animation. + + When we select the \uicontrol {Show Live Preview} button on the + \uicontrol {Form Editor} toolbar, we see a running number and moving + progress indicator of the animated progress bar instance. + + \image progressbar-animated.png + + We now change the settings of the other two progress bar instances. We + make one of the indicators move from right to left by starting from frame + 100. When all our progress bar instances have been animated, we'll continue + by specifying easing curves for them. + + For more information about previewing UIs, see \l {Previewing}. + + \section1 Specifying Easing Curves + + We can add custom easing curves to every keyframe in the animations. First, + we select the keyframe to add the easing curve to, and then select + \uicontrol {Edit Easing Curve} in the context menu. We can select several + keyframes simultaneously if we want to use the same easing curve for them. + + We select the easing curve in the \uicontrol {Easing Curve Editor}. + + \image studio-easing-curve-editor.png "Easing Curve Editor" + + When we apply easing curves to animations, the shape of the keyframe + marker changes from \inlineimage keyframe_linear_inactive.png + to \inlineimage keyframe_manualbezier_inactive.png + . + + For more information, see \l{Editing Easing Curves}. +*/ diff --git a/doc/qtdesignstudio/examples/doc/sidemenu.qdoc b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc new file mode 100644 index 00000000000..498b017ca34 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/sidemenu.qdoc @@ -0,0 +1,235 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \example SideMenu + \ingroup studioexamples + + \title Side Menu + \brief Illustrates how to create reusable components and an animated menu + for applying effects. + + \image sidemenu.png "Side menu example application" + + \e {Side Menu} displays a menu bar and a side menu that slides open when + users click the menu icon. The appearance of the menu bar buttons changes + when users hover the cursor over them or select them. + + Each button opens an image file. The side menu can be used to apply + \l {Qt Graphical Effects}{graphical effects}, such as hue, saturation, + and blur, to the images. + + \section1 Creating Reusable Buttons + + We select \uicontrol File > \uicontrol {New File or Project} > + \uicontrol {Files and Classes} > \uicontrol {Qt Quick Controls} > + \uicontrol {Custom Button} to create a reusable menu bar button + that we call \e CustomButton. + + The button can have the following states: checked, hover, pressed, and + normal. We construct the button using different images for the button + background, frame, and front. We then add states in the \uicontrol States + view for each of the button states. In each state, we turn the visibility + of the appropriate images on or off in the button properties, to change + the appearance of the button. + + \image sidemenu-custombutton-states.png "CustomButton QML type states" + + To change the button text when the button state changes, we bind the + text property to the state of the button in the \uicontrol Properties view. + When \e control is selected in the \uicontrol Navigator, we select the + \uicontrol Settings menu for the \uicontrol Text property, and then select + \uicontrol {Set Binding}. In the \uicontrol {Binding Editor}, we set the + binding to \c control.state. + + \image sidemenu-custombutton-property-bindings.png + + We want the buttons to be checkable, so we set the + \l {AbstractButton::}{checkable} property to \c true. + + We now select \uicontrol {Set when Condition} in the \uicontrol Settings menu + for the states to bind the properties to the states using \c when + conditions. First, we specify that a button instance enters the \e checked + state when the \l {AbstractButton::}{checked} property is set to \c true. + This is how the code will look in the \uicontrol {Text Editor}: + + \quotefromfile SideMenu/CustomButton.qml + \skipto states: [ + \printuntil when + + We then bind the \e hover state to the \l {Control::}{hovered} property + being set to \c true, while the \c checked and + \l {AbstractButton::}{pressed} properties are set to \c false: + + \dots + \skipto State { + \printuntil when + + Finally, the button state is set to \e normal, when all the properties are + set to \c false: + + \dots + \skipto State { + \printuntil when + + We can now use CustomButton instances to create a menu bar. + + \section1 Constructing a Menu Bar + + We construct the menu bar in the \e {MainFile.ui.qml} file using the + \uicontrol {Form Editor}. The CustomButton type is listed in + \uicontrol Library > \uicontrol {QML Types} > + \uicontrol {My QML Components}. We drag and drop several instances of + the type to the \uicontrol {Form Editor} and enclose them in a RowLayout + type to lay them out as a menu bar. + + \image sidemenu-menubar.png + + We can change the properties of each CustomButton instance separately in + the \uicontrol Properties view. We want only one of the menu bar buttons + to be checked at any time, so that checking another button automatically + unchecks the previously checked one. Therefore, we set the + \l {AbstractButton::}{autoExclusive} property to \c true for all + button instances. + + In addition, we set the \uicontrol Checked property to \c true for the + first button instance on the menu bar to make it appear selected. + + We can now select the \inlineimage run_small.png "Run button" + (\uicontrol Run) button to run the application and test our menu bar. + + \section1 Creating a Side Menu + + We can now continue to create a side menu that slides open when users + click the burger menu. In the \uicontrol {Form Editor}, we use the + \l Text and \l Slider components to create separate submenus for each + set of effects we want to apply to the images. We use a background image + for the menu background and a BurgerMenu custom QML type for the burger + menu icon. + + \image sidemenu-ui.png "SliderMenu type" + + We add states to the \e {SideMenu.qml} file in the \uicontrol {Form Editor}. + When the application starts, the side menu is in the \e closed state, which + means that it is hidden. When users click the burger menu, the \c onClicked + signal handler triggers the transition to the \e opening state and runs an + animation. When the animation finishes, the side menu state changes to + \e open and the side menu is fully visible. + + When users click the burger menu again, the state changes to \e closing and + another animation is run that closes the side menu. When the animation + finishes, the side menu returns to the \e closed state. + + We select the \inlineimage plus.png + (\uicontrol Add) button in the \uicontrol States view to add the states: + + \image sidemenu-states.png "Side menu states" + + We then select the \inlineimage plus.png + button in the \uicontrol Timeline view to add animation + for transitions to the \e open and \e close states: + + \image sidemenu-timeline-settings.png "Side menu timeline settings" + + The closing animation is just the opening animation played backwards to + hide the side menu. We want the opening animation to be slower than the + closing animation, so we specify a shorter duration for the closing + animation. This does not affect the duration of the timeline itself. + + We want to change the position of the outline and background images. To + start recording the transition from the closed state to the open state, + we select \e imageOutline in \uicontrol Navigator. We check that the + playhead is at frame 0, and then select the \inlineimage recordfill.png + (\uicontrol {Auto Key (K)}) button (or press \key k). + + At frame 0, we set the X coordinate to -423 in \uicontrol Properties > + \uicontrol Geometry > \uicontrol Position. We then move the playhead + to frame 1000 and set the X coordinate to 0. + + When we deselect the record button to stop recording the timeline, the + new timeline appears in the view. + + \image sidemenu-timeline.png "Timeline view" + + We then record the transition of the \e imageBackground image. At frame + 0, we set the X coordinate to -424 again. We then move the playhead to + frame 400 and select \uicontrol {Insert Keyframe} in the \uicontrol Settings + menu of the X coordinate. We keep the value of the X coordinate -424. We + then move the playhead to frame 1000 and set the X coordinate to 0. + + We select \inlineimage animation.png "Timeline Settings button" + to open the \uicontrol {Timeline Settings} dialog. In the + \uicontrol {Transitions to states} field, we select the state to + switch to when the animation finishes. In the lower part of the + dialog, we bind the states that don't have animations to fixed frames. + + For more information about using the timeline, see \l {Creating Animations}. + + \section1 Connecting the Burger Menu to Actions + + In \e {SideMenu.qml}, we use connections to bind the action of clicking + the burger menu to the signal handler for triggering the opening or + closing animation, depending on the current state. We create the connections + in the \uicontrol Connections view. + + \image sidemenu-connections.png + + We use property changes to disable the burger menu until the animation + finishes and to hide and show the side menu: + + \quotefromfile SideMenu/SideMenu.qml + \skipto State { + \printuntil }, + + The side menu is fully visible and accepts input only in the \e open state. + + For more information about connecting objects to signals, see + \l {Connecting Objects to Signals}. + + \section1 Applying Effects + + We nest the effects in an effects stack and bind them to the \l Slider type + instances. The effects apply to all the images in the example application, + not just the currently open one. + + We use property bindings to connect the controls in the slider menu to + \l {Qt Graphical Effects}{graphical effects}. To have access to the + properties from all the slider type instances, we export them as aliases + in \e SliderMenu.ui.qml. We select \uicontrol {Export Property as Alias} + in the \uicontrol Settings menu of the \uicontrol Value property in + \uicontrol Properties > \uicontrol Slider. + + We use the \uicontrol {Form Editor} to create the effect stack in the + \e {EffectStack.qml} file: + + \image sidemenu-effects-stack.png "Effects stack in the Navigator" + + We use the \l Image type as the last item in the stack to display images + that we apply the effects to. We export the image source property as an + alias to be able to switch the image inside the stack. + + For more information about the available Qt graphical effects, see + \l {Applying Visual Effects}. +*/ diff --git a/doc/qtdesignstudio/examples/doc/webinardemo.qdoc b/doc/qtdesignstudio/examples/doc/webinardemo.qdoc new file mode 100644 index 00000000000..1e13961c917 --- /dev/null +++ b/doc/qtdesignstudio/examples/doc/webinardemo.qdoc @@ -0,0 +1,196 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \example WebinarDemo + \ingroup studioexamples + \brief Contains sources for the From Photoshop to Prototype video tutorial. + + \title Webinar Demo + + \e {Webinar Demo} contains the source files for the + \e {From Photoshop to Prototype with Qt Design Studio} + webinar that shows how to export designs from Adobe Photoshop + to \QDS and to edit them to create a UI. + + The following sections describe some of the main points of the webinar. + Select the \uicontrol Tutorials tab to watch the webinar video for the + full details. + + \section1 Exporting from Adobe Photoshop + + We use Adobe Photoshop to design our application and \QB to export our + artwork to \QDS as PNG images and custom QML types. + + Before we can begin, we must set up \QB as instructed in + \l{Exporting Designs from Adobe Photoshop}. + + We organize our artwork in Photoshop using artboards as instructed in + \l{Organizing Assets}. + + \QB automatically proposes identifiers for all groups and layers. The ids + will be used as filenames in \QDS. We want to change some of them in the + \uicontrol {QML ID} field, so that we can easily find them in \QDS. We + must keep in mind that the ids must be unique, that they must begin with + a lower-case letter or an underscore character, and that only letters, + numbers, and underscore characters are allowed. + + Each artboard is exported automatically as a component. That is, a separate + QML file that contains all the artwork on the artboard. We determine whether + each group or layer is exported as a component or a child item. Child items + will be exported as PNG files, with references to them in the component file + that contains them. + + We can export some components as QML types that provide the functionality + that we want. To use the types in \QDS, we need to add import statements + that pull in the modules that contain the types. We can even specify + properties for the types to export, so that we won't have to do that in + \QDS. + + \section2 Creating a Reference Image + + \image webinardemo-qb-layoutref.png "Settings for exporting stackLayout artboard" + + We want to create a reference image of the UI that has no + functionality, but shows all the UI controls as we designed them in + Adobe Photoshop. We design all the controls visible on the + \e layoutReference separately on other artboards, and therefore we can + select \uicontrol Merged in the \uicontrol {Export As} field to merge + them all into one image when this artboard is exported. + + \section2 Creating the UI Main Page + + We want to use the \e backgroundGradient artboard as the main page of + the UI. Initially, it will contain a gradient image that we + will build the UI on in \QDS. + + We set the gradient image on the artboard to \uicontrol Child in the + \uicontrol {Export As} field to export it as a PNG file that is referred + to from the main page. + + \section2 Using Stack Layout + + \image webinardemo-qb-stacklayout.png "Settings for exporting stackLayout artboard" + + For the stackLayoutFrame layer, we want to use a \l StackLayout QML type, + which provides a stack of items where only one item is visible at a time. + In the \uicontrol {QML Type} field, we enter \e StackLayout. + + To be able to use the type, we enter the statement that imports the + Qt Quick Layouts module, which contains the type, in the + \uicontrol {Add Imports} field: \c {QtQuick.Layouts 1.3}. + + We will add content to the stack layout in \QDS. + + \section2 Using Qt Studio Effects + + \image webinardemo-qb-fastblur.png "Settings for exporting blurEffect layer" + + We want to apply the \l {FastBlur} effect to the smallPopup UI control. + In the artboard, we have a blurEffect layer that we want to export as a + FastBlurItem QML type. In the \uicontrol {QML Type} field, we enter + \e FastBlurItem. + + To be able to use the type, we added the statement that imports the + Qt Quick Studio Effects module: \c {QtQuick.Studio.Effects 1.0}. + + We specify that the artwork to which we want to apply the effect is a + child of the effect. We then specify the radius property for the effect, + in the \uicontrol {QML Properties} field. We can modify the property in + \QDS. + + \image webinardemo-blureffect.png "FastBlurItem QML item in Design mode" + + \section2 Creating a Menu with Reusable Buttons + + The \e miniMenu artboard contains menu buttons that we will use to toggle + popup dialogs in the UI. We want to be able to reuse the buttons + and to change their appearance depending on whether they are on or off. + Therefore, we select \uicontrol Component in the \uicontrol {Export As} + field for each button to export them as separate components that we can + modify in \QDS. + + Within the artboard, we export each icon as a child and the background as + merged. This merges the background art together while it keeps the icons + separate, so that we can switch the icons depending on the state of the + button. We will implement this functionality in \QDS. + + \section2 Preparing for Animation + + We want to animate the contents of the \e largePopup artboard in \QDS, so + we export each group and layer as a child. + + \section2 Exporting Artwork + + When we have specified settings for all the artboards and the groups and + layers in them, we select \uicontrol Export to copy the assets and metadata + to the export path we specified. + + \section1 Importing Artwork + + After using \QB in Adobe Photoshop to export our artwork, we import it into + a project that we create in \QDS, as instructed in \l{Importing Designs}. + + If we need to make changes in Photoshop later and export our artwork again, + \QDS will try to merge our changes during the import, so that none of the + changes we mage in \QDS are lost. + + \section1 Using Imported Components + + The \e {LayoutReference.ui.qml} file contains a reference image of the + UI we will create. We use the imported components to create the + UI in the \e {MainApp.ui.qml} file. The imported components are + listed in \uicontrol Library > \uicontrol {QML Types} > + \uicontrol {My QML Components}, and we can drag and drop them to the + \uicontrol {Form Editor}. + + \image webinardemo-mainappui.png "Main app UI in Design mode" + + To view the structure of a particular component, we right-click it in the + \uicontrol {Form Editor} and select \uicontrol {Go into Component} in the + context menu. Any changes we make to a component are immediately visible in + all the other components where it appears. + + We can view the QML code for each component in the \uicontrol {Text Editor}. + + We can now use states and the timeline to animate the components in the UI. + + \section2 Animating Components + + We open the \e {Largepopup.ui.qml} file in the Design mode to add animation + to it. In the \uicontrol States view, we add the \e opening, \e open, + \e closing, and \e closed states for the popup. + + \image webinardemo-states.png "Popup states in the States view" + + For more information about using states, see \l {Creating Animations}. + + We then use the \uicontrol Timeline view to add animations that are run + when moving from one state to another. + + \image webinardemo-timeline.png "Popup animations in the Timeline view" + + For more information about using the timeline, see \l {Creating Animations}. +*/ diff --git a/doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject b/doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject new file mode 100644 index 00000000000..01655717717 --- /dev/null +++ b/doc/qtdesignstudio/examples/ebikedesign/EBikeDesign.qmlproject @@ -0,0 +1,44 @@ +import QmlProject 1.1 + +Project { + mainFile: "EBikeDesign.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + + JavaScriptFiles { + directory: "." + } + + ImageFiles { + directory: "." + } + + Files { + filter: "*.conf" + files: ["qtquickcontrols2.conf"] + } + + Files { + filter: "qmldir" + directory: "." + } + + Files { + filter: "*.ttf" + directory: "." + } + + Environment { + QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" + QT_AUTO_SCREEN_SCALE_FACTOR: "1" + } + + /* List of plugin directories passed to QML runtime */ + importPaths: [ "imports", "backend"] + + /* Required for deployment */ + targetDirectory: "/opt/ebikeDesign" +} diff --git a/doc/qtdesignstudio/examples/sidemenu/CustomButton.qml b/doc/qtdesignstudio/examples/sidemenu/CustomButton.qml new file mode 100644 index 00000000000..9f140b69a22 --- /dev/null +++ b/doc/qtdesignstudio/examples/sidemenu/CustomButton.qml @@ -0,0 +1,214 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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.10 +import QtQuick.Templates 2.1 as T +import SideMenu 1.0 + +T.Button { + id: control + width: 180 + height: 70 + + font: Constants.font + implicitWidth: Math.max(background ? background.implicitWidth : 0, + contentItem.implicitWidth + leftPadding + rightPadding) + implicitHeight: Math.max(background ? background.implicitHeight : 0, + contentItem.implicitHeight + topPadding + bottomPadding) + leftPadding: 4 + rightPadding: 4 + + text: control.state + property alias text1Text: text1.text + autoExclusive: false + checkable: true + + + Image { + id: background + x: 15 + y: 17 + source: "assets/inactive_button.png" + } + + Image { + id: contentItem + x: -1 + y: 0 + visible: true + source: "assets/hover_button.png" + } + + Image { + id: image2 + x: 0 + y: -1 + visible: true + source: "assets/active_button.png" + } + + Text { + id: text1 + x: -1 + y: 16 + width: 163 + height: 16 + color: "#ffffff" + text: "PRESSED" + horizontalAlignment: Text.AlignHCenter + font.weight: Font.ExtraLight + font.family: "IBM Plex Sans" + font.pixelSize: 12 + } + + states: [ + State { + name: "checked" + when: control.checked + + PropertyChanges { + target: background + x: 16 + y: 16 + width: 156 + visible: false + } + + PropertyChanges { + target: contentItem + visible: false + } + + PropertyChanges { + target: image2 + x: 0 + y: 0 + visible: true + } + + PropertyChanges { + target: text1 + x: 0 + y: 16 + width: 162 + height: 16 + text: "CHECKED" + horizontalAlignment: Text.AlignHCenter + } + + }, + State { + name: "hover" + when: control.hovered && !control.checked && !control.pressed + + PropertyChanges { + target: image2 + x: 0 + visible: false + } + + PropertyChanges { + target: background + x: 16 + y: 16 + visible: false + } + + PropertyChanges { + target: contentItem + visible: true + } + + PropertyChanges { + target: text1 + x: -1 + y: 16 + width: 162 + height: 16 + color: "#d07533" + text: "HOVER" + horizontalAlignment: Text.AlignHCenter + } + + + }, + State { + name: "normal" + when: !control.pressed && !control.checked &&!control.hovered + + + PropertyChanges { + target: image2 + visible: false + } + + PropertyChanges { + target: contentItem + visible: false + } + + PropertyChanges { + target: background + visible: true + } + + PropertyChanges { + target: text1 + x: 15 + y: 33 + width: 163 + height: 16 + color: "#d07533" + text: "NORMAL" + horizontalAlignment: Text.AlignHCenter + } + } + ] +} diff --git a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qml b/doc/qtdesignstudio/examples/sidemenu/SideMenu.qml new file mode 100644 index 00000000000..4649d497e6c --- /dev/null +++ b/doc/qtdesignstudio/examples/sidemenu/SideMenu.qml @@ -0,0 +1,234 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Design Studio. +** +** $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.8 +import QtQuick.Timeline 1.0 +import QtQuick.Controls 2.3 + +Item { + id: root + width: 350 + height: 1080 + property alias slidermenuSlider_4BValue: slidermenu.slider_4BValue + property alias slidermenuSlider_4AValue: slidermenu.slider_4AValue + property alias slidermenuSlider_3CValue: slidermenu.slider_3CValue + property alias slidermenuSlider_3BValue: slidermenu.slider_3BValue + property alias slidermenuSlider_3AValue: slidermenu.slider_3AValue + property alias slidermenuSlider_1BValue: slidermenu.slider_1BValue + property alias slidermenuSlider_1CValue: slidermenu.slider_1CValue + property alias slidermenuSlider_2BValue: slidermenu.slider_2BValue + property alias slidermenuSlider_2AValue: slidermenu.slider_2AValue + property alias slidermenuSlider_1AValue: slidermenu.slider_1AValue + + state: "closed" + + Image { + id: sideMenuAsset + x: 0 + y: 0 + visible: false + source: "assets/rectangle_3_195_205.png" + } + + Image { + id: imageOutline + x: -423 + y: 0 + height: 1079 + source: "assets/empty_rect.png" + } + + Image { + id: imageBackground + x: 0 + y: 0 + source: "assets/rectangle_3_195_205.png" + + SliderMenu { + id: slidermenu + width: 349 + height: 1079 + slider_1AValue: -0.3 + } + } + + BurgerMenu { + id: burger_menu + x: 22 + y: 20 + } + + Timeline { + id: timeline + enabled: true + animations: [ + TimelineAnimation { + id: timelineAnimation + property: "currentFrame" + pingPong: false + duration: 300 + from: 0 + loops: 1 + to: 1000 + //alwaysRunToEnd: true + running: false + onFinished: root.state = "open" + }, + TimelineAnimation { + id: timelineAnimation2 + property: "currentFrame" + pingPong: false + duration: 700 + from: 1000 + loops: 1 + to: 0 + //alwaysRunToEnd: true + running: false + onFinished: root.state = "closed" + } + ] + endFrame: 1000 + startFrame: 0 + + KeyframeGroup { + target: imageOutline + property: "x" + Keyframe { + easing.bezierCurve: [0.337, 0.229, 0.758, 0.282, 1, 1] + frame: 1000 + value: 0 + } + + Keyframe { + frame: 1 + value: -348 + } + } + + KeyframeGroup { + target: imageBackground + property: "x" + Keyframe { + frame: 402 + value: -423 + } + + Keyframe { + frame: 0 + value: -424 + } + + Keyframe { + easing.bezierCurve: [0.337, 0.229, 0.758, 0.282, 1, 1] + frame: 1000 + value: 0 + } + } + } + + Connections { + target: burger_menu + onClicked: { + root.state = "opening" + } + enabled: root.state === "closed" + } + + Connections { + target: burger_menu + onClicked: { + root.state = "closing" + } + enabled: root.state === "open" + } + + states: [ + State { + name: "opening" + + PropertyChanges { + target: timelineAnimation + running: true + } + + PropertyChanges { + target: burger_menu + enabled: false + } + + PropertyChanges { + target: slidermenu + visible: false + } + }, + State { + name: "open" + }, + State { + name: "closing" + PropertyChanges { + target: timelineAnimation2 + running: true + } + + PropertyChanges { + target: burger_menu + enabled: false + } + }, + State { + name: "closed" + PropertyChanges { + target: slidermenu + visible: false + } + } + ] +} diff --git a/doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject b/doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject new file mode 100644 index 00000000000..22969ff4d8a --- /dev/null +++ b/doc/qtdesignstudio/examples/sidemenu/SideMenu.qmlproject @@ -0,0 +1,41 @@ +/* File generated by Qt Creator */ + +import QmlProject 1.1 + +Project { + mainFile: "MainFile.ui.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + + JavaScriptFiles { + directory: "." + } + + ImageFiles { + directory: "." + } + + Files { + filter: "*.conf" + files: ["qtquickcontrols2.conf"] + } + + Files { + filter: "qmldir" + directory: "." + } + + Environment { + QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" + QT_AUTO_SCREEN_SCALE_FACTOR: "1" + } + + /* List of plugin directories passed to QML runtime */ + importPaths: [ "imports" ] + + /* Required for deployment */ + targetDirectory: "/tmp/SideMenu" +} diff --git a/doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject b/doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject new file mode 100644 index 00000000000..5a19a305abd --- /dev/null +++ b/doc/qtdesignstudio/examples/webinardemo/WebinarDemo.qmlproject @@ -0,0 +1,41 @@ +/* File generated by Qt Creator */ + +import QmlProject 1.1 + +Project { + mainFile: "MainApp.ui.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + + JavaScriptFiles { + directory: "." + } + + ImageFiles { + directory: "." + } + + Files { + filter: "*.conf" + files: ["qtquickcontrols2.conf"] + } + + Files { + filter: "qmldir" + directory: "." + } + + Environment { + QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf" + QT_AUTO_SCREEN_SCALE_FACTOR: "1" + } + + /* List of plugin directories passed to QML runtime */ + importPaths: [ "imports" ] + + /* Required for deployment */ + targetDirectory: "/opt/WebinarDemo" +} diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc index d666763e557..1def2283b28 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage studio-getting-started.html \page qtbridge-overview.html \nextpage psqtbridge.html diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc index 272a0454210..b4c5ec0267f 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-overview.qdoc @@ -26,7 +26,6 @@ // Note: The \page value is hard-coded as a link in Qt Bridge for Adobe Photoshop. /*! - \contentspage {Qt Design Studio Manual} \previouspage qtbridge-overview.html \page psqtbridge.html \nextpage qtbridge-ps-setup.html diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc index 6e3b8ef3cd3..6af3a302741 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-setup.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \previouspage psqtbridge.html \page qtbridge-ps-setup.html \nextpage qtbridge-ps-using.html diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc index 754a73f6350..fad3ccd8a13 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage qtbridge-ps-setup.html \page qtbridge-ps-using.html \nextpage sketchqtbridge.html @@ -81,8 +80,8 @@ Place different parts of the UI, such as menus and pop-ups, on separate artboards to be able to export them as components or children and to - import them as QML and PNG files that you can drag and drop to the working - area in \QDS Design mode while creating a UI. + import them as QML and PNG files that you can drag and drop to the + \uicontrol {Form Editor} in \QDS Design mode while creating a UI. \QDS offers predefined sets of UI controls that you can modify according to your needs. You can export your own controls as QML types, Qt Quick diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc index dbb986aa614..a897ab044d9 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-overview.qdoc @@ -26,7 +26,6 @@ // Note: The \page value is hard-coded as a link in Qt Bridge for Sketch. /*! - \contentspage {Qt Design Studio Manual} \previouspage qtbridge-ps-using.html \page sketchqtbridge.html \nextpage qtbridge-sketch-setup.html diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc index 46d611ad514..793f59f574a 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-setup.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage index.html \previouspage sketchqtbridge.html \page qtbridge-sketch-setup.html \nextpage qtbridge-sketch-using.html diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc index 412c20fca2e..7e52e058383 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage qtbridge-sketch-setup.html \page qtbridge-sketch-using.html \nextpage exporting-3d-assets.html @@ -93,7 +92,7 @@ Place different parts of the UI, such as menus and pop-ups, on separate artboards to be able to export them as components or children and to import them as QML files and images that you can drag and drop to the - working area in \QDS Design mode while creating a UI. + \uicontrol {Form Editor} in \QDS Design mode while creating a UI. \section2 Using Layers and Groups diff --git a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc index 1b4fc732849..afeb074ca75 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-advanced.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage qt-design-viewer.html \page studio-advanced.html \nextpage studio-platforms.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc index 808872eef01..ad072db594d 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc +++ b/doc/qtdesignstudio/src/qtdesignstudio-components.qdocinc @@ -35,7 +35,8 @@ \l {Qt Quick Shapes QML Types}, with some additional properties. You can drag-and-drop the following studio components from the - \uicontrol Library to the canvas or the \uicontrol Navigator: + \uicontrol Library to the \uicontrol {Form Editor} or the + \uicontrol Navigator: \list \li \l Arc adds an arc that begins and ends at given positions. diff --git a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc index 98687a88a78..d50c6153db7 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-debugging.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage studio-javascript.html \page studio-debugging.html \nextpage creator-debugging-qml.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc index 03e119d3c3c..d1fa52b418b 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-examples.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage studio-help.html \group studioexamples \nextpage creator-help.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc index 7667fa5a10d..0cc58cf493f 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-faq.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-help.html \page studio-faq.html \nextpage studio-terms.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc index a9b12d10571..ff5a00f43a0 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-getting-started.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage index.html \page studio-getting-started.html \nextpage qtbridge-overview.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc index 8c983839f21..19551df97f9 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-help-overview.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page studio-help.html \previouspage creator-editor-external.html \nextpage {Examples and Tutorials} diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc index 65335c3a5c7..f5515805057 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-2d.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage studio-importing-designs.html \page studio-importing-2d.html \nextpage studio-importing-3d.html @@ -87,12 +86,11 @@ The imported assets are displayed in the \uicontrol Assets tab in the \uicontrol Library as PNG images. The components that you specified in the design tool are displayed in the \uicontrol {My QML Components} tab, - as well as in the \uicontrol Project tab of the \uicontrol Navigator as - separate QML files. + as well as in the \uicontrol Projects view as separate QML files. \note The layer that was the bottom layer in the design tool becames the top layer in the \uicontrol Navigator to reflect the QML code model. You - can view the QML code in the \uicontrol {Text Editor} tab. + can view the QML code in the \uicontrol {Text Editor}. If asset importer conflicts, warnings, and errors are displayed in the \uicontrol {Asset Import} dialog while importing, fix the issues in diff --git a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc index 887a148e817..e681f694278 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-importing-designs.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-vcs-git.html \page studio-importing-designs.html \nextpage studio-importing-2d.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc index a182ba79515..43aed58d930 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-javascript.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage creator-editor-options-text.html \page studio-javascript.html \nextpage studio-debugging.html @@ -93,7 +92,7 @@ \code singleton Values 1.0 Values.qml \endcode - \li Open \e Values.qml in the \uicontrol {Text Editor} tab for editing. + \li Open \e Values.qml in the \uicontrol {Text Editor} for editing. \li Add the following code to the top of the file to register the QObject-derived class that you will use to expose the global properties as a singleton type: diff --git a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc index 0e4e52a2783..7332df5a3fb 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-platforms.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage studio-advanced.html \page studio-platforms.html \nextpage creator-keyboard-shortcuts.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc index 6f313d66889..c09078339f0 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects-overview.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage {Tutorials} \page studio-projects-managing.html \nextpage studio-projects.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc index 54ff29935f1..f98f53349b5 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-projects.qdoc @@ -24,8 +24,6 @@ ****************************************************************************/ /*! - - \contentspage {Qt Design Studio Manual} \previouspage studio-projects-managing.html \page studio-projects.html \nextpage creator-vcs-git.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc index 5bb5b2f2deb..7c6ee4cf0d4 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-terms.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page studio-terms.html \previouspage studio-faq.html \nextpage creator-acknowledgements.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index b5b7d372e0f..eba04079841 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page qtdesignstudio-toc.html \title All Topics diff --git a/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc index da98ee0690f..f5c6d20ab8d 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-tutorials.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \previouspage creator-using-qt-quick-designer.html \group gstutorials \nextpage studio-projects-managing.html diff --git a/doc/qtdesignstudio/src/qtdesignstudio-visual-effects.qdocinc b/doc/qtdesignstudio/src/qtdesignstudio-visual-effects.qdocinc index e373dc80a84..8683539cacb 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-visual-effects.qdocinc +++ b/doc/qtdesignstudio/src/qtdesignstudio-visual-effects.qdocinc @@ -31,9 +31,10 @@ \QDS provides a set of Qt Quick Studio effects that inherit the types in the \l {Qt Graphical Effects} module. To apply a visual effect to a component, you must place the component inside the effect. First drag-and-drop an - effect from \uicontrol Library > \uicontrol Effects to the the canvas or - the \uicontrol Navigator, and then drag-and-drop the component to the - effect. For some effects, you need two source components. + effect from \uicontrol Library > \uicontrol Effects to the the + \uicontrol {Form Editor} or the \uicontrol Navigator, and then drag-and-drop + the component to the effect. For some effects, you need two source + components. The following table summarizes the available effects and contains links to the documentation of the inherited QML type. diff --git a/doc/qtdesignstudio/src/qtdesignstudio.qdoc b/doc/qtdesignstudio/src/qtdesignstudio.qdoc index 1a696084f43..979ba94e13a 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage{index.html}{Qt Design Studio} \page index.html \nextpage studio-getting-started.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc index ce448c3f20f..94a949d8681 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc @@ -27,7 +27,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page exporting-3d-assets.html \if defined(qtdesignstudio) \previouspage qtbridge-sketch-using.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc index ff22f15c6b7..4de01d77dfc 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-blender.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page exporting-from-blender.html \previouspage exporting-3d-assets.html \nextpage exporting-from-maya.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc index 8903bc238ae..eab2e007e2a 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page exporting-from-maya.html \previouspage exporting-from-blender.html \if defined (qtdesignstudio) diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc index 0c33b4bc206..cd5ef0566df 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-camera.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-camera.html \previouspage studio-3d-lights.html \nextpage studio-3d-scene-environment.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc index 38a71a1b535..7f6e7c88caf 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-components.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-components.html \previouspage studio-3d-view.html \nextpage studio-3d-node.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc index 947e72cc258..3d9da455cb3 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page studio-3d-design-mode.html \if defined (qtdesignstudio) \previouspage studio-3d.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc index 89a6b7742d9..5b7fe602d5a 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-editor.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage studio-3d-design-mode.html \page studio-3d-editor.html \nextpage studio-3d-view.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc index d8025677cf5..1cab52e7000 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page studio-importing-3d.html \if defined(qtdesignstudio) \previouspage studio-importing-2d.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc index a247785f034..cfd19be8832 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-lights.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-lights.html \previouspage studio-3d-texture.html \nextpage studio-3d-camera.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc index 48f853c97ec..bcef4094078 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-materials-shaders.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-materials.html \previouspage studio-3d-model.html \nextpage studio-3d-texture.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc index 6e6effcab9a..cfc573470fa 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-model.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-model.html \previouspage studio-3d-node.html \nextpage studio-3d-materials.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc index b9fb65731ca..43774025232 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage studio-3d-components.html \page studio-3d-node.html \nextpage studio-3d-model.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc index 3844439569f..16653e7f4bc 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-scene-environment.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-scene-environment.html \previouspage studio-3d-camera.html \if defined (qtdesignstudio) diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc index 2ad8a24a812..0dd0efda24e 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc @@ -26,7 +26,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page studio-3d-texture.html \previouspage studio-3d-materials.html \nextpage studio-3d-lights.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc index 8a3930a3f15..de749793575 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \previouspage studio-3d-editor.html \page studio-3d-view.html \nextpage studio-3d-components.html diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc index 976ae9aca4e..6a2939e5e96 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage index.html \page studio-3d.html \previouspage qmldesigner-pathview-editor.html \if defined(qtdesignstudio) diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-iso.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-iso.qdoc index 6fb8ed4feb5..c0bec2cc692 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-iso.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-iso.qdoc @@ -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 Design Studio documentation. @@ -54,8 +54,8 @@ \endcode To select an icon in the \uicontrol {ISO Icon Browser} in \QDS, select - the ISO icon in the \uicontrol Navigator or on the canvas, and then - select \uicontrol {Choose Icon} in the context menu. + the ISO icon in the \uicontrol Navigator or \uicontrol {Form Editor}, + and then select \uicontrol {Choose Icon} in the context menu. \image iso-icon-browser.png */ diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc index 82eef3cae7a..da170cef0cf 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/qtquickdesigner-components.qdoc @@ -24,7 +24,6 @@ ****************************************************************************/ /*! - \contentspage {Qt Design Studio Manual} \page qtquickdesigner-components-overview.html \title Qt Quick Studio Components diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 90ce78887ce..ad8f4954287 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -1658,7 +1658,7 @@ class DumperBase(): #with self.timer('metaObjectType-' + self.currentIName): metaObjectPtr = extractStaticMetaObjectPtrFromType(typeobj) - if not metaObjectPtr: + if not metaObjectPtr and not self.isWindowsTarget(): # measured: 200 ms (example had one level of inheritance) #with self.timer('metaObjectCall-' + self.currentIName): metaObjectPtr = extractMetaObjectPtrFromAddress() diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme new file mode 100644 index 00000000000..788b4680eb8 --- /dev/null +++ b/share/qtcreator/themes/design-light.creatortheme @@ -0,0 +1,305 @@ +[General] +ThemeName=Design Light +PreferredStyles=Fusion + + +[Palette] +shadowBackground=ffd1cfcf +text=ff000000 +textDisabled=55000000 +selectedBackgroundText=aa1f75cc +toolBarItem=a0010508 +toolBarItemDisabled=38000000 +fancyBarsNormalTextColor=ff000000 +fancyBarsBoldTextColor=a0010508 +hoverBackground=1a000000 +selectedBackground=ffffffff +normalBackground=ffffffff +alternateBackground=ff515151 +stop_error=ffec7373 +run_success=ff52c23b +error=ffdf4f4f +warning=ffecbc1c +splitter=ffbdbebf +qmlDesignerButtonColor=fff8f8f8 +textColorLink=ff007af4 +textColorLinkVisited=ffa57aff +backgroundColorDisabled=ff444444 + +[Colors] +;DS controls theme START +DScontrolBackground=ffffffff +DScontrolOutline=ff777777 +DStextColor=ff242424 +DSdisabledTextColor=ff505050 +DSpanelBackground=fff2f2f2 +DShoverHighlight=ffe6e6e6 +DScolumnBackground=ffaaaaaa +DSfocusEdit=ffeaeaea +DSfocusDrag=ffd1d1d1 +DScontrolBackgroundPressed=ff505050 +DScontrolBackgroundChecked=ff5e5e5e +DSinteraction=ff0492c9 +DSsliderActiveTrack=ff363636 +DSsliderInactiveTrack=ffe6e6e6 +DSsliderHandle=ff777777 +DSsliderActiveTrackHover=ff7f7f7f +DSsliderInactiveTrackHover=ff5e5e5e +DSsliderHandleHover=ff505050 +DSsliderActiveTrackFocus=ff363636 +DSsliderInactiveTrackFocus=ff505050 +DSsliderHandleFocus=ff0492c9 +DSerrorColor=ffdf3a3a +DScontrolBackgroundDisabled=ffaaaaaa +DScontrolOutlineDisabled=ff777777 +DStextColorDisabled=ff505050 +DStextSelectionColor=ff0492c9 +DStextSelectedTextColor=ffffffff +DSscrollBarTrack=ff777777 +DSscrollBarHandle=ff505050 +DScontrolBackgroundInteraction=ff777777 +DStranslationIndicatorBorder=ffebebeb +DSsectionHeadBackground=ffebebeb +DSchangedStateText=ff99ccff +;DS controls theme END + +BackgroundColorAlternate=alternateBackground +BackgroundColorDark=shadowBackground +BackgroundColorHover=hoverBackground +BackgroundColorNormal=normalBackground +BackgroundColorDisabled=ff444444 +BackgroundColorSelected=selectedBackground +BadgeLabelBackgroundColorChecked=ffe0e0e0 +BadgeLabelBackgroundColorUnchecked=ff808080 +BadgeLabelTextColorChecked=ff606060 +BadgeLabelTextColorUnchecked=ffffffff +CanceledSearchTextColor=ff0000 +ComboBoxArrowColor=toolBarItem +ComboBoxArrowColorDisabled=toolBarItemDisabled +ComboBoxTextColor=fancyBarsNormalTextColor +DetailsButtonBackgroundColorHover=b4ffffff +DetailsWidgetBackgroundColor=28ffffff +DockWidgetResizeHandleColor=splitter +DoubleTabWidget1stSeparatorColor=ffff0000 +DoubleTabWidget1stTabActiveTextColor=ff000000 +DoubleTabWidget1stTabBackgroundColor=ffff0000 +DoubleTabWidget1stTabInactiveTextColor=ff555555 +DoubleTabWidget2ndSeparatorColor=ffff0000 +DoubleTabWidget2ndTabActiveTextColor=ffffffff +DoubleTabWidget2ndTabBackgroundColor=ffff0000 +DoubleTabWidget2ndTabInactiveTextColor=ff000000 +EditorPlaceholderColor=fff4f4f4 +FancyToolBarSeparatorColor=toolBarItemDisabled +FancyTabBarBackgroundColor=shadowBackground +FancyTabBarSelectedBackgroundColor=selectedBackground +FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled +FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled +FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor +FancyTabWidgetEnabledUnselectedTextColor=fancyBarsBoldTextColor +FancyToolButtonHoverColor=hoverBackground +FancyToolButtonSelectedColor=selectedBackground +FutureProgressBackgroundColor=shadowBackground +IconsBaseColor=toolBarItem +IconsDisabledColor=toolBarItemDisabled +IconsInfoColor=ff3099dc +IconsInfoToolBarColor=ff3099dc +IconsWarningColor=warning +IconsWarningToolBarColor=ffecbc1c +IconsErrorColor=error +IconsErrorToolBarColor=ffdf4f4f +IconsRunColor=run_success +IconsRunToolBarColor=run_success +IconsStopColor=stop_error +IconsStopToolBarColor=stop_error +IconsInterruptColor=ff587ff7 +IconsInterruptToolBarColor=ff6a7bc3 +IconsDebugColor=toolBarItem +IconsNavigationArrowsColor=ff3dabe6 +IconsBuildHammerHandleColor=ffc26b14 +IconsBuildHammerHeadColor=ff868687 +IconsModeWelcomeActiveColor=ff5caa15 +IconsModeEditActiveColor=ff6a6add +IconsModeDesignActiveColor=ffbb6000 +IconsModeDebugActiveColor=ff6a6add +IconsModeProjectActiveColor=ff5caa15 +IconsModeAnalyzeActiveColor=ff43adee +IconsModeHelpActiveColor=fffaa838 +IconsCodeModelKeywordColor=ff777777 +IconsCodeModelClassColor=ffc0b550 +IconsCodeModelStructColor=ff53b053 +IconsCodeModelFunctionColor=ffd34373 +IconsCodeModelVariableColor=ff2bbbcc +IconsCodeModelEnumColor=ffc0b550 +IconsCodeModelMacroColor=ff476ba0 +IconsCodeModelAttributeColor=ff316511 +IconsCodeModelUniformColor=ff994899 +IconsCodeModelVaryingColor=ffa08833 +IconsCodeModelOverlayBackgroundColor=70ffffff +IconsCodeModelOverlayForegroundColor=ff232425 +InfoBarBackground=ffffffe1 +InfoBarText=text +MenuBarEmptyAreaBackgroundColor=shadowBackground +MenuBarItemBackgroundColor=shadowBackground +MenuBarItemTextColorDisabled=textDisabled +MenuBarItemTextColorNormal=text +MenuItemTextColorDisabled=textDisabled +MenuItemTextColorNormal=text +MiniProjectTargetSelectorBackgroundColor=shadowBackground +MiniProjectTargetSelectorBorderColor=shadowBackground +MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground +MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor +PanelStatusBarBackgroundColor=shadowBackground +PanelsWidgetSeparatorLineColor=000000 +PanelTextColorDark=text +PanelTextColorMid=ff666666 +PanelTextColorLight=fancyBarsNormalTextColor +ProgressBarColorError=error +ProgressBarColorFinished=run_success +ProgressBarColorNormal=ff888888 +ProgressBarTitleColor=fancyBarsBoldTextColor +ProgressBarBackgroundColor=28000000 +SplitterColor=splitter +TextColorDisabled=textDisabled +TextColorError=ffff4040 +TextColorHighlight=ffff0000 +TextColorHighlightBackground=ffef0b +TextColorLink=ff007af4 +TextColorLinkVisited=ffa57aff +TextColorNormal=text +ToggleButtonBackgroundColor=shadowBackground +ToolBarBackgroundColor=shadowBackground +TreeViewArrowColorNormal=hoverBackground +TreeViewArrowColorSelected=text + +OutputPanes_DebugTextColor=text +OutputPanes_ErrorMessageTextColor=ffaa0000 +OutputPanes_MessageOutput=ff0000aa +OutputPanes_NormalMessageTextColor=ff0000aa +OutputPanes_StdErrTextColor=ffaa0000 +OutputPanes_StdOutTextColor=ff000000 +OutputPanes_WarningMessageTextColor=ff808000 +OutputPanes_TestPassTextColor=ff009900 +OutputPanes_TestFailTextColor=ffa00000 +OutputPanes_TestXFailTextColor=ff28f028 +OutputPanes_TestXPassTextColor=fff02828 +OutputPanes_TestSkipTextColor=ff787878 +OutputPanes_TestWarnTextColor=ffd0bb00 +OutputPanes_TestFatalTextColor=ff640000 +OutputPanes_TestDebugTextColor=ff329696 +OutputPaneButtonFlashColor=ffff0000 +OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor +OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor + +Debugger_LogWindow_LogInput=ff00acac +Debugger_LogWindow_LogStatus=ff00875a +Debugger_LogWindow_LogTime=ffbf0303 + +Debugger_WatchItem_ValueNormal=text +Debugger_WatchItem_ValueInvalid=textDisabled +Debugger_WatchItem_ValueChanged=ffbf0303 + +Debugger_Breakpoint_TextMarkColor=ffff4040 + +Welcome_TextColor=ff000000 +Welcome_ForegroundPrimaryColor=ff404244 +Welcome_ForegroundSecondaryColor=ff727476 +Welcome_BackgroundColor=normalBackground +Welcome_ButtonBackgroundColor=normalBackground +Welcome_DividerColor=ffd6d6d6 +Welcome_HoverColor=fff6f6f6 +Welcome_LinkColor=ff5caa15 +Welcome_DisabledLinkColor=textDisabled + +Timeline_TextColor=text +Timeline_BackgroundColor1=normalBackground +Timeline_BackgroundColor2=fff6f6f6 +Timeline_DividerColor=ffd6d6d6 +Timeline_HighlightColor=ff3099dc +Timeline_PanelBackgroundColor=ffd6d6d6 +Timeline_PanelHeaderColor=ff888888 +Timeline_HandleColor=ff888888 +Timeline_RangeColor=selectedBackground + +VcsBase_FileStatusUnknown_TextColor=ff000000 +VcsBase_FileAdded_TextColor=ff00aa00 +VcsBase_FileModified_TextColor=ff0000ee +VcsBase_FileDeleted_TextColor=ff800000 +VcsBase_FileRenamed_TextColor=ffd77d00 +VcsBase_FileUnmerged_TextColor=ffee0000 + +Bookmarks_TextMarkColor=ffa0a0ff + +TextEditor_SearchResult_ScrollBarColor=ff00c000 +TextEditor_CurrentLine_ScrollBarColor=ff404040 + +ProjectExplorer_TaskError_TextMarkColor=error +ProjectExplorer_TaskWarn_TextMarkColor=warning + +CodeModel_Error_TextMarkColor=error +CodeModel_Warning_TextMarkColor=warning + +;new colors +QmlDesigner_BackgroundColor=qmlDesignerButtonColor +QmlDesigner_HighlightColor=ff0492c9 +QmlDesigner_FormEditorSelectionColor=ffd3299a +QmlDesigner_FormEditorForegroundColor=ffffffff +QmlDesigner_BackgroundColorDarkAlternate=qmlDesignerButtonColor +QmlDesigner_BackgroundColorDarker=fff5f5f5 +QmlDesigner_BorderColor=splitter +QmlDesigner_ButtonColor=f0f0f0 +QmlDesigner_TabDark=ff63676b +QmlDesigner_TabLight=ffffffff +QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor +QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor + +;extra_new_colors +QmlDesigner_FormeditorBackgroundColor=ff000000 +QmlDesigner_AlternateBackgroundColor=ffc14fc1 +QmlDesigner_ScrollBarHandleColor=ff8b8e8f + +;palette colors + +PaletteWindow=selectedBackground +PaletteWindowText=text +PaletteBase=normalBackground +PaletteAlternateBase=alternateBackground +PaletteButton=selectedBackground +PaletteBrightText=selectedBackgroundText +PaletteText=text +PaletteButtonText=text +PaletteButtonTextDisabled=textDisabled +PaletteToolTipBase=selectedBackground + +PaletteHighlight=ff0492c9 + +PaletteDark=shadowBackground +PaletteHighlightedText=ffffffff +PaletteToolTipText=text +PaletteLink=textColorLink +PaletteLinkVisited=textColorLinkVisited +PaletteWindowDisabled=backgroundColorDisabled +PaletteWindowTextDisabled=textDisabled +PaletteBaseDisabled=backgroundColorDisabled +PaletteTextDisabled=textDisabled + +[Flags] +ComboBoxDrawTextShadow=false +DerivePaletteFromTheme=true +DrawIndicatorBranch=true +DrawSearchResultWidgetFrame=false +DrawTargetSelectorBottom=false +DrawToolBarHighlights=false +DrawToolBarBorders=true +ApplyThemePaletteGlobally=true +FlatToolBars=true +FlatSideBarIcons=true +FlatProjectsMode=false +FlatMenuBar=true +ToolBarIconShadow=false +WindowColorAsBase=false +DarkUserInterface=false + +[Gradients] +DetailsWidgetHeaderGradient\1\color=00000000 +DetailsWidgetHeaderGradient\1\pos=1 +DetailsWidgetHeaderGradient\size=1 diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index ff2af332fe9..914a717bdfa 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -1,88 +1,68 @@ [General] -ThemeName=Design +ThemeName=Design Dark PreferredStyles=Fusion DefaultTextEditorColorScheme=creator-dark.xml [Palette] - -;color for the mode toolbar, un-selected tabs, toolbars for each panel, scroll bar backgrounds and active tab panels, text for the non selected tabs. -;shadowBackground=ff404244 shadowBackground=ff191919 - - -;main text color -;text=ffd0d0d0 text=ffdadada - -;disabled text textDisabled=60a4a6a8 - -;background for selected text selectedBackgroundText=aa1f75cc - -;icons, spinbox ticks, -;toolBarItem=b6fbfdff toolBarItem=ffb3b3b3 - - -; all disabled icons and the separators between icons -;toolBarItemDisabled=60a4a6a8 toolBarItemDisabled=ff686868 - - - -;text for dropdown selectors in the panel menus, file selection and text for all pop out panels such as issues, search results, etc. fancyBarsNormalTextColor=ffd0d0d0 -;fancyBarsNormalTextColor=ffd3299a - - - -;text for the mode sidebar menu. fancyBarsBoldTextColor=b6fbfdff -;fancyBarsBoldTextColor=b6d3299a - - - -;also the color for the scroll bar handles and inside rectangle for the Type text box, and the working area timeline ruler. -;also the background selection rectangle for icons and selection highlight for bounding box. -;hoverBackground=22ffffff hoverBackground=ff404244 - - - -;blended background color for controls 1 spinboxes, background selection square for snapping modes, publish as alias icon. -;color for filter background and overwrite width and height boxes -;selectedBackground=66000000 selectedBackground=ff111111 - - -;background for default "open a document" screen in the edit mode, -;normalBackground=ff2E2F30 normalBackground=ff262728 - - - -;not used anywhere i can see alternateBackground=ff353637 - - error=ffdf4f4f warning=ffecbc1c - - -;dividng lines between all the panels -;splitter=ff06080A splitter=ff474747 - - - - - textColorLink=ff007af4 textColorLinkVisited=ffa57aff backgroundColorDisabled=ff444444 + + + [Colors] +;DS controls theme START +DScontrolBackground=ff242424 +DScontrolOutline=ff404040 +DStextColor=ffffffff +DSdisabledTextColor=ff909090 +DSpanelBackground=ff2a2a2a +DShoverHighlight=ff313131 +DScolumnBackground=ff363636 +DSfocusEdit=ff444444 +DSfocusDrag=ff565656 +DScontrolBackgroundPressed=ff606060 +DScontrolBackgroundChecked=ff565656 +DSinteraction=ff0492c9 +DSsliderActiveTrack=ff606060 +DSsliderInactiveTrack=ff404040 +DSsliderHandle=ff505050 +DSsliderActiveTrackHover=ff7f7f7f +DSsliderInactiveTrackHover=ff505050 +DSsliderHandleHover=ff606060 +DSsliderActiveTrackFocus=ffaaaaaa +DSsliderInactiveTrackFocus=ff606060 +DSsliderHandleFocus=ff0492c9 +DSerrorColor=ffdf3a3a +DScontrolBackgroundDisabled=ff363636 +DScontrolOutlineDisabled=ff404040 +DStextColorDisabled=ff606060 +DStextSelectionColor=ff0492c9 +DStextSelectedTextColor=ffffffff +DSscrollBarTrack=ff404040 +DSscrollBarHandle=ff505050 +DScontrolBackgroundInteraction=ff404040 +DStranslationIndicatorBorder=ff7f7f7f +DSsectionHeadBackground=ff191919 +DSchangedStateText=ff99ccff +;DS controls theme END + BackgroundColorAlternate=alternateBackground BackgroundColorDark=shadowBackground BackgroundColorHover=hoverBackground @@ -267,8 +247,7 @@ QmlDesigner_BackgroundColor=ff4c4e50 ; Design View selected items - Navigator Selection, Timeline Property Selection, TImeline bar, property text highlighted -QmlDesigner_HighlightColor=ff3f91c4 -;QmlDesigner_HighlightColor=ffd3299a +QmlDesigner_HighlightColor=ff0492c9 @@ -314,11 +293,9 @@ QmlDesigner_TabLight=text ;extra_new_colors -; color for the form editor background -;QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor + QmlDesigner_FormeditorBackgroundColor=ff000000 -;QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor QmlDesigner_AlternateBackgroundColor=ffc14fc1 QmlDesigner_ScrollBarHandleColor=ff595b5c @@ -361,7 +338,6 @@ PaletteBrightText=ffff3333 ;PaletteBrightText=ffd3299a -; ; text inside dropdown combo boxes, styles, connections. PaletteText=text ;PaletteText=ffd3299a @@ -383,7 +359,6 @@ PaletteToolTipBase=selectedBackground ;the selection highlight on the dropdown combo box in the file selection top menu and connections panel and tab mode selector dropdowns PaletteHighlight=selectedBackgroundText -;PaletteHighlight=ffd3299a ; outline of warning in editor mode, underline of "open a document" page in the edit mode diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index fb7c6d36e01..dbe962908f1 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -738,7 +738,7 @@ The files in the Android package source directory are copied to the build direct </message> <message> <source>This is useful for apps that use SSL operations. The path can be defined in Tools > Options > Devices > Android.</source> - <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты > Настройки > Устройства > Android.</translation> + <translation>Полезно для приложений, использующих операции SSL. Путь можно задать в Инструменты > Параметры > Устройства > Android.</translation> </message> <message> <source>Build Android APK</source> @@ -1237,7 +1237,7 @@ Do you want to uninstall the existing package?</source> <name>Android::Internal::AndroidPlugin</name> <message> <source>Would you like to configure Android options? This will ensure Android kits can be usable and all essential packages are installed. To do it later, select Options > Devices > Android.</source> - <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Настройки > Устройства > Android.</translation> + <translation>Настроить Android? Предполагается, что комплекты Android доступны, а необходимые пакеты установлены. Чтобы сделать это позже перейдите в Параметры > Устройства > Android.</translation> </message> <message> <source>Configure Android</source> @@ -25719,7 +25719,7 @@ Error: %5</translation> </message> <message> <source>Sampler name</source> - <translation type="unfinished">Имя семплера</translation> + <translation>Имя семплера</translation> </message> <message> <source>Sets the name of the effect's source texture property.</source> @@ -26475,10 +26475,6 @@ Error: %5</translation> <source>NXP i.MXRT SDK</source> <translation>NXP i.MXRT SDK</translation> </message> - <message> - <source>SEGGER JLink</source> - <translation>SEGGER JLink</translation> - </message> </context> <context> <name>McuSupport::Internal::McuSupportDevice</name> @@ -26507,6 +26503,17 @@ Error: %5</translation> </message> </context> <context> + <name>McuSupport::Internal::McuSupportPlugin</name> + <message> + <source>Create Kits for Qt for MCUs? To do it later, select Options > Devices > MCU.</source> + <translation>Создать комплекты для Qt для микроконтроллеров? Можно сделать позже через Параметры > Устройства > Микроконтроллер.</translation> + </message> + <message> + <source>Create Kits for Qt for MCUs</source> + <translation>Создать комплекты для Qt для микроконтроллеров</translation> + </message> +</context> +<context> <name>Mercurial::Internal::AuthenticationDialog</name> <message> <source>Dialog</source> @@ -31154,7 +31161,7 @@ What should Qt Creator do now?</source> </message> <message> <source>Disable in subdirectories:</source> - <translation>Выключить по подкаталогах:</translation> + <translation>Выключить в подкаталогах:</translation> </message> <message> <source>Runs this step only for a top-level build.</source> @@ -40337,42 +40344,14 @@ For more information, see the "Checking Code Syntax" documentation.</s <translation>Ожидается определение зависимостей</translation> </message> <message> - <source>Expected only Property, Method, Signal and Enum object definitions, not "%1".</source> - <translation>Ожидаются только определения объектов Property, Method, Signal и Enum, а не «%1».</translation> - </message> - <message> - <source>Expected only name, prototype, defaultProperty, attachedType, exports, isSingleton, isCreatable, isComposite and exportMetaObjectRevisions script bindings, not "%1".</source> - <translation>Ожидаются только связки со скриптами name, prototype, defaultProperty, attachedType, exports, isSingleton, isCreatable, isComposite и exportMetaObjectRevisions, но не «%1».</translation> - </message> - <message> - <source>Expected only script bindings and object definitions.</source> - <translation>Ожидаются только связки со скриптами и определения объектов.</translation> - </message> - <message> <source>Component definition is missing a name binding.</source> <translation>В определении компонента отсутствует связка name.</translation> </message> <message> - <source>Expected only uri, version and name script bindings.</source> - <translation>Ожидаются только связки со скриптами uri, version и name.</translation> - </message> - <message> - <source>Expected only script bindings.</source> - <translation>Ожидаются только связки со скриптами.</translation> - </message> - <message> <source>ModuleApi definition has no or invalid version binding.</source> <translation>У определения ModuleApi связка version отсутствует или некорректна.</translation> </message> <message> - <source>Expected only Parameter object definitions.</source> - <translation>Ожидаются только определения объектов Parameter.</translation> - </message> - <message> - <source>Expected only name and type script bindings.</source> - <translation>Ожидаются только связки со скриптами name и type.</translation> - </message> - <message> <source>Method or signal is missing a name script binding.</source> <translation>У метода или сигнала отсутствует связка со скриптами name.</translation> </message> @@ -40381,18 +40360,10 @@ For more information, see the "Checking Code Syntax" documentation.</s <translation>Ожидается связка со скриптом.</translation> </message> <message> - <source>Expected only type, name, revision, isPointer, isReadonly and isList script bindings.</source> - <translation>Ожидаются только связки со скриптами type, name, revision, isPointer, isReadonly и isList.</translation> - </message> - <message> <source>Property object is missing a name or type script binding.</source> <translation>У объекта Property отсутствует связка со скриптами name или type.</translation> </message> <message> - <source>Expected only name and values script bindings.</source> - <translation>Ожидаются только связки со скриптами name и values.</translation> - </message> - <message> <source>Expected string after colon.</source> <translation>Ожидается строка после запятой.</translation> </message> @@ -42736,7 +42707,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf <name>QtSupport::Internal::QtSupportPlugin</name> <message> <source>Link with a Qt installation to automatically register Qt versions and kits? To do this later, select Options > Kits > Qt Versions > Link with Qt.</source> - <translation>Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Настройки > Комплекты > Профили Qt > Связать с Qt.</translation> + <translation>Связать с Qt для автоматической регистрации профилей Qt и комплектов? Это можно сделать позже в меню Параметры > Комплекты > Профили Qt > Связать с Qt.</translation> </message> <message> <source>Link with Qt</source> diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 406f9048f8a..b94406b185c 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -80,10 +80,9 @@ static QHash<QString, QString> m_headerSourceMapping; class CppToolsPluginPrivate { public: - CppToolsPluginPrivate() - { - m_codeModelSettings.fromSettings(ICore::settings()); - } + CppToolsPluginPrivate() {} + + void initialize() { m_codeModelSettings.fromSettings(ICore::settings()); } ~CppToolsPluginPrivate() { @@ -165,6 +164,7 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) Q_UNUSED(error) d = new CppToolsPluginPrivate; + d->initialize(); JsExpander::registerGlobalObject<CppToolsJsExtension>("Cpp"); ExtensionSystem::PluginManager::addObject(&d->m_cppProjectUpdaterFactory); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 1518e1ee8e8..0fadcc150a1 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3261,7 +3261,7 @@ void GdbEngine::handlePeripheralRegisterListValues( const QString output = response.consoleStreamOutput; // Regexp to match for '0x50060800:\t0\n'. - const QRegularExpression re("^(0x[0-9A-F]+):\\t(\\d+)\\n$"); + const QRegularExpression re("^(0x[0-9A-Fa-f]+):\\t(\\d+)\\n$"); const QRegularExpressionMatch m = re.match(output); if (!m.hasMatch()) return; diff --git a/src/plugins/marketplace/productlistmodel.cpp b/src/plugins/marketplace/productlistmodel.cpp index a49f544c3d3..cded10ee37b 100644 --- a/src/plugins/marketplace/productlistmodel.cpp +++ b/src/plugins/marketplace/productlistmodel.cpp @@ -106,7 +106,7 @@ void ProductListModel::onFetchCollectionsFinished(QNetworkReply *reply) const auto handle = obj.value("handle").toString(); const int productsCount = obj.value("products_count").toInt(); - if (productsCount > 0 && handle != "all-products") + if (productsCount > 0 && handle != "all-products" && handle != "qt-education-1") m_pendingCollections.append(handle); } if (!m_pendingCollections.isEmpty()) diff --git a/src/plugins/mcusupport/mcusupportconstants.h b/src/plugins/mcusupport/mcusupportconstants.h index 30d28f44df4..3d223f48094 100644 --- a/src/plugins/mcusupport/mcusupportconstants.h +++ b/src/plugins/mcusupport/mcusupportconstants.h @@ -38,6 +38,7 @@ const char KIT_MCUTARGET_MODEL_KEY[] = "McuSupport.McuTargetModel"; const char KIT_MCUTARGET_SDKVERSION_KEY[] = "McuSupport.McuTargetSdkVersion"; const char KIT_MCUTARGET_KITVERSION_KEY[] = "McuSupport.McuTargetKitVersion"; const char KIT_MCUTARGET_COLORDEPTH_KEY[] = "McuSupport.McuTargetColorDepth"; +const char KIT_MCUTARGET_OS_KEY[] = "McuSupport.McuTargetOs"; const char SETTINGS_GROUP[] = "McuSupport"; const char SETTINGS_KEY_PACKAGE_PREFIX[] = "Package_"; diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index b4651ce4755..8d573bf994a 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -61,7 +61,7 @@ namespace McuSupport { namespace Internal { -static const int KIT_VERSION = 2; // Bumps up whenever details in Kit creation change +static const int KIT_VERSION = 3; // Bumps up whenever details in Kit creation change static QString packagePathFromSettings(const QString &settingsKey, const QString &defaultPath = {}) { @@ -320,11 +320,12 @@ QVariant McuToolChainPackage::debuggerId() const return debuggerId; } -McuTarget::McuTarget(const QString &vendor, const QString &platform, +McuTarget::McuTarget(const QString &vendor, const QString &platform, OS os, const QVector<McuPackage *> &packages, const McuToolChainPackage *toolChainPackage) : m_vendor(vendor) , m_qulPlatform(platform) + , m_os(os) , m_packages(packages) , m_toolChainPackage(toolChainPackage) { @@ -345,6 +346,11 @@ const McuToolChainPackage *McuTarget::toolChainPackage() const return m_toolChainPackage; } +McuTarget::OS McuTarget::os() const +{ + return m_os; +} + QString McuTarget::qulPlatform() const { return m_qulPlatform; @@ -477,6 +483,7 @@ static void setKitProperties(const QString &kitName, ProjectExplorer::Kit *k, k->setValue(KIT_MCUTARGET_COLORDEPTH_KEY, mcuTarget->colorDepth()); k->setValue(KIT_MCUTARGET_SDKVERSION_KEY, McuSupportOptions::supportedQulVersion().toString()); k->setValue(KIT_MCUTARGET_KITVERSION_KEY, KIT_VERSION); + k->setValue(KIT_MCUTARGET_OS_KEY, static_cast<int>(mcuTarget->os())); k->setAutoDetected(true); k->makeSticky(); if (mcuTarget->toolChainPackage()->type() == McuToolChainPackage::TypeDesktop) @@ -576,6 +583,8 @@ static void setKitCMakeOptions(ProjectExplorer::Kit *k, const McuTarget* mcuTarg (qulDir + "/lib/cmake/Qul/QulGenerators.cmake").toUtf8())); config.append(CMakeConfigItem("QUL_PLATFORM", mcuTarget->qulPlatform().toUtf8())); + if (mcuTarget->os() == McuTarget::OS::FreeRTOS) + config.append(CMakeConfigItem("OS", "FreeRTOS")); if (mcuTarget->colorDepth() >= 0) config.append(CMakeConfigItem("QUL_COLOR_DEPTH", QString::number(mcuTarget->colorDepth()).toLatin1())); @@ -594,7 +603,8 @@ static void setKitQtVersionOptions(ProjectExplorer::Kit *k) QString McuSupportOptions::kitName(const McuTarget *mcuTarget) { - // TODO: get version from qulSdkPackage and insert into name + const QString os = QLatin1String(mcuTarget->os() + == McuTarget::OS::FreeRTOS ? " FreeRTOS" : ""); const QString colorDepth = mcuTarget->colorDepth() > 0 ? QString::fromLatin1(" %1bpp").arg(mcuTarget->colorDepth()) : ""; @@ -603,8 +613,8 @@ QString McuSupportOptions::kitName(const McuTarget *mcuTarget) mcuTarget->toolChainPackage()->type() == McuToolChainPackage::TypeDesktop ? "Desktop" : mcuTarget->qulPlatform(); - return QString::fromLatin1("Qt for MCUs %1 - %2%3") - .arg(supportedQulVersion().toString(), targetName, colorDepth); + return QString::fromLatin1("Qt for MCUs %1 - %2%3%4") + .arg(supportedQulVersion().toString(), targetName, os, colorDepth); } QList<ProjectExplorer::Kit *> McuSupportOptions::existingKits(const McuTarget *mcuTarget) @@ -620,6 +630,8 @@ QList<ProjectExplorer::Kit *> McuSupportOptions::existingKits(const McuTarget *m kit->value(KIT_MCUTARGET_VENDOR_KEY) == mcuTarget->vendor() && kit->value(KIT_MCUTARGET_MODEL_KEY) == mcuTarget->qulPlatform() && kit->value(KIT_MCUTARGET_COLORDEPTH_KEY) == mcuTarget->colorDepth() + && kit->value(KIT_MCUTARGET_OS_KEY).toInt() + == static_cast<int>(mcuTarget->os()) )); }); } diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h index 72d395090f6..cdc7d3a31a1 100644 --- a/src/plugins/mcusupport/mcusupportoptions.h +++ b/src/plugins/mcusupport/mcusupportoptions.h @@ -131,13 +131,20 @@ class McuTarget : public QObject Q_OBJECT public: - McuTarget(const QString &vendor, const QString &platform, const QVector<McuPackage *> &packages, - const McuToolChainPackage *toolChainPackage); + enum class OS { + Desktop, + BareMetal, + FreeRTOS + }; + + McuTarget(const QString &vendor, const QString &platform, OS os, + const QVector<McuPackage *> &packages, const McuToolChainPackage *toolChainPackage); QString vendor() const; QVector<McuPackage *> packages() const; const McuToolChainPackage *toolChainPackage() const; QString qulPlatform() const; + OS os() const; void setColorDepth(int colorDepth); int colorDepth() const; bool isValid() const; @@ -145,6 +152,7 @@ public: private: const QString m_vendor; const QString m_qulPlatform; + const OS m_os = OS::BareMetal; const QVector<McuPackage*> m_packages; const McuToolChainPackage *m_toolChainPackage; int m_colorDepth = -1; diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 73afb438f57..bd57cd5c50e 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -220,6 +220,24 @@ static McuPackage *createMcuXpressoIdePackage() return result; } +static McuPackage *createFreeRTOSSourcesPackage(const QString &envVarPrefix) +{ + const QString envVar = envVarPrefix + "_FREERTOS_DIR"; + + const QString defaultPath = + qEnvironmentVariableIsSet(envVar.toLatin1()) ? + qEnvironmentVariable(envVar.toLatin1()) : QDir::homePath(); + + auto result = new McuPackage( + QString::fromLatin1("FreeRTOS Sources (%1)").arg(envVarPrefix), + defaultPath, + {}, + QString::fromLatin1("FreeRTOSSourcePackage_%1").arg(envVarPrefix)); + result->setDownloadUrl("https://freertos.org"); + result->setEnvironmentVariableName(envVar); + return result; +} + void hardcodedTargetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage *> *packages, QVector<McuTarget *> *mcuTargets) { @@ -231,6 +249,9 @@ void hardcodedTargetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage McuPackage* evkbImxrt1050SdkPackage = Sdk::createEvkbImxrt1050SdkPackage(); McuPackage *mcuXpressoIdePackage = createMcuXpressoIdePackage(); McuPackage *rglPackage = createRGLPackage(); + McuPackage *freeRTOSSTM32F7Package = createFreeRTOSSourcesPackage("STM32F7"); + McuPackage *freeRTOSIMXRT1050Package = createFreeRTOSSourcesPackage("IMXRT1050"); + McuPackage *freeRTOSIMXRT1064Package = createFreeRTOSSourcesPackage("IMXRT1064"); QVector<McuPackage*> stmEvalPackages = { armGccPackage, stm32CubeProgrammerPackage}; @@ -242,7 +263,8 @@ void hardcodedTargetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage *packages = { armGccPackage, desktopToolChainPackage, ghsToolchainPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, evkbImxrt1050SdkPackage, - mcuXpressoIdePackage, rglPackage}; + mcuXpressoIdePackage, rglPackage, + freeRTOSSTM32F7Package, freeRTOSIMXRT1050Package, freeRTOSIMXRT1064Package}; const QString vendorStm = "STM"; const QString vendorNxp = "NXP"; @@ -254,33 +276,58 @@ void hardcodedTargetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage const QString qulPlatform; const QVector<McuPackage*> &packages; McuToolChainPackage *toolchainPackage; + McuPackage *freeRTOSPackage; const QVector<int> colorDepths; } targets[] = { - {vendorNxp, {"MIMXRT1050-EVK"}, nxpEvalPackages, armGccPackage, {16}}, - {vendorNxp, {"MIMXRT1064-EVK"}, nxpEvalPackages, armGccPackage, {16}}, - {vendorQt, {"Qt"}, desktopPackages, desktopToolChainPackage, {32}}, - {vendorRenesas, {"RH850-D1M1A"}, renesasEvalPackages, ghsToolchainPackage, {32}}, - {vendorStm, {"STM32F469I-DISCOVERY"}, stmEvalPackages, armGccPackage, {24}}, - {vendorStm, {"STM32F7508-DISCOVERY"}, stmEvalPackages, armGccPackage, {32, 16}}, - {vendorStm, {"STM32F769I-DISCOVERY"}, stmEvalPackages, armGccPackage, {32}}, - {vendorStm, {"STM32H750B-DISCOVERY"}, stmEvalPackages, armGccPackage, {32}}, - {vendorStm, {"STM32L4R9I-DISCOVERY"}, stmEvalPackages, armGccPackage, {24}}, - {vendorStm, {"STM32L4R9I-EVAL"}, stmEvalPackages, armGccPackage, {24}} + {vendorNxp, {"MIMXRT1050-EVK"}, nxpEvalPackages, armGccPackage, + freeRTOSIMXRT1050Package, {16}}, + {vendorNxp, {"MIMXRT1064-EVK"}, nxpEvalPackages, armGccPackage, + freeRTOSIMXRT1064Package, {16}}, + {vendorQt, {"Qt"}, desktopPackages, desktopToolChainPackage, + nullptr, {32}}, + {vendorRenesas, {"RH850-D1M1A"}, renesasEvalPackages, ghsToolchainPackage, + nullptr, {32}}, + {vendorStm, {"STM32F469I-DISCOVERY"}, stmEvalPackages, armGccPackage, + nullptr, {24}}, + {vendorStm, {"STM32F7508-DISCOVERY"}, stmEvalPackages, armGccPackage, + freeRTOSSTM32F7Package, {32, 16}}, + {vendorStm, {"STM32F769I-DISCOVERY"}, stmEvalPackages, armGccPackage, + freeRTOSSTM32F7Package, {32}}, + {vendorStm, {"STM32H750B-DISCOVERY"}, stmEvalPackages, armGccPackage, + nullptr, {32}}, + {vendorStm, {"STM32L4R9I-DISCOVERY"}, stmEvalPackages, armGccPackage, + nullptr, {24}}, + {vendorStm, {"STM32L4R9I-EVAL"}, stmEvalPackages, armGccPackage, + nullptr, {24}} }; const QString QulTargetTemplate = dir.toString() + "/lib/cmake/Qul/QulTargets/QulTargets_%1_%2.cmake"; - for (auto target : targets) { - for (int colorDepth : target.colorDepths) { - const QString QulTarget = - QulTargetTemplate.arg(target.qulPlatform, QString::number(colorDepth)); - if (!Utils::FilePath::fromUserInput(QulTarget).exists()) - continue; - auto mcuTarget = new McuTarget(target.vendor, target.qulPlatform, target.packages, - target.toolchainPackage); - if (target.colorDepths.count() > 1) - mcuTarget->setColorDepth(colorDepth); - mcuTargets->append(mcuTarget); + for (const auto target : targets) { + for (auto os : {McuTarget::OS::Desktop, McuTarget::OS::BareMetal, + McuTarget::OS::FreeRTOS}) { + for (int colorDepth : target.colorDepths) { + QVector<McuPackage*> required3rdPartyPackages = target.packages; + if (os == McuTarget::OS::FreeRTOS) { + if (target.freeRTOSPackage) + required3rdPartyPackages.append(target.freeRTOSPackage); + else + continue; + } else if (os == McuTarget::OS::Desktop && target.toolchainPackage->type() + != McuToolChainPackage::TypeDesktop) { + continue; + } + + const QString QulTarget = + QulTargetTemplate.arg(target.qulPlatform, QString::number(colorDepth)); + if (!Utils::FilePath::fromUserInput(QulTarget).exists()) + continue; + auto mcuTarget = new McuTarget(target.vendor, target.qulPlatform, os, + required3rdPartyPackages, target.toolchainPackage); + if (target.colorDepths.count() > 1) + mcuTarget->setColorDepth(colorDepth); + mcuTargets->append(mcuTarget); + } } } } diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp index ac68bd3b679..fa9fe08b2c1 100644 --- a/src/plugins/projectexplorer/msvcparser.cpp +++ b/src/plugins/projectexplorer/msvcparser.cpp @@ -209,7 +209,7 @@ void MsvcParser::flush() // ".\qwindowsgdinativeinterface.cpp(48,3) : error: unknown type name 'errr'" static inline QString clangClCompilePattern() { - return QLatin1String(FILE_POS_PATTERN) + " (warning|error): (.*)$"; + return QLatin1String(FILE_POS_PATTERN) + " ?(warning|error): (.*)$"; } ClangClParser::ClangClParser() @@ -631,6 +631,27 @@ void ProjectExplorerPlugin::testClangClOutputParsers_data() << CompileTask(Task::Error, error2.trimmed(), FilePath::fromUserInput(".\\qwindowsgdinativeinterface.cpp"), 51)) << ""; + + QTest::newRow("other error") + << "C:\\Program Files\\LLVM\\bin\\clang-cl.exe /nologo /c /EHsc /Od -m64 /Zi /MDd " + "/DUNICODE /D_UNICODE /DWIN32 /FdTestForError.cl.pdb " + "/FoC:\\MyData\\Project_home\\cpp\build-TestForError-msvc_2017_clang-Debug\\Debug_msvc_201_47eca974c876c8b3\\TestForError.b6dd39ae\\3a52ce780950d4d9\\main.cpp.obj " + "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp /TP\r\n" + "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp(3,10): error: expected ';' after return statement\r\n" + "return 0\r\n" + " ^\r\n" + " ;" + << OutputParserTester::STDERR + << "" + << "C:\\Program Files\\LLVM\\bin\\clang-cl.exe /nologo /c /EHsc /Od -m64 /Zi /MDd " + "/DUNICODE /D_UNICODE /DWIN32 /FdTestForError.cl.pdb " + "/FoC:\\MyData\\Project_home\\cpp\build-TestForError-msvc_2017_clang-Debug\\Debug_msvc_201_47eca974c876c8b3\\TestForError.b6dd39ae\\3a52ce780950d4d9\\main.cpp.obj " + "C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp /TP\r\n" + " ;\n" + << Tasks{CompileTask(Task::Error, "expected ';' after return statement\nreturn 0", + FilePath::fromUserInput("C:\\MyData\\Project_home\\cpp\\TestForError\\main.cpp"), + 3)} + << ""; } void ProjectExplorerPlugin::testClangClOutputParsers() @@ -639,9 +660,9 @@ void ProjectExplorerPlugin::testClangClOutputParsers() testbench.addLineParser(new ClangClParser); QFETCH(QString, input); QFETCH(OutputParserTester::Channel, inputChannel); - QFETCH(Tasks, tasks); QFETCH(QString, childStdOutLines); QFETCH(QString, childStdErrLines); + QFETCH(Tasks, tasks); QFETCH(QString, outputLines); testbench.testParsing(input, inputChannel, diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs index a0496e7dbb5..446dc250c79 100644 --- a/tests/auto/extensionsystem/plugin.qbs +++ b/tests/auto/extensionsystem/plugin.qbs @@ -1,5 +1,5 @@ -import qbs import qbs.FileInfo +import qbs.Utilities import QtcFunctions DynamicLibrary { @@ -12,6 +12,15 @@ DynamicLibrary { targetName: QtcFunctions.qtLibraryName(qbs, name.split('_')[1]) destinationDirectory: project.buildDirectory + '/' + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) + cpp.cxxFlags: { + var flags = []; + if (qbs.toolchain.contains("clang") + && Utilities.versionCompare(cpp.compilerVersion, "10") >= 0) { + // Triggers a lot in Qt. + flags.push("-Wno-deprecated-copy", "-Wno-constant-logical-operand"); + } + return flags; + } cpp.rpaths: [ project.buildDirectory + "/" + qtc.libDirName + "/qtcreator", project.buildDirectory + "/" + qtc.libDirName + "/qtcreator/plugins" |
