diff options
153 files changed, 3077 insertions, 1491 deletions
@@ -20,6 +20,7 @@ Prerequisites: * ActiveState Active Perl * MinGW with g++ 4.9 or Visual Studio 2015 or later * jom + * Python 3.5 or later (optional, needed for the python enabled debug helper) * On Mac OS X: latest Xcode * On Linux: g++ 4.9 or later * LLVM/Clang 6.0.0 or later (optional, needed for the Clang Code Model, see the @@ -35,6 +36,8 @@ You can build Qt Creator with export LLVM_INSTALL_DIR=/path/to/llvm (or "set" on Windows) # Optional, needed to let the QbsProjectManager plugin use system Qbs: export QBS_INSTALL_DIR=/path/to/qbs + # Optional, needed for the Python enabled dumper on Windows + set PYTHON_INSTALL_DIR=C:\path\to\python cd $SOURCE_DIRECTORY qmake -r diff --git a/dist/changes-4.7.0.md b/dist/changes-4.7.0.md index 4967dd3472..2844aa15c8 100644 --- a/dist/changes-4.7.0.md +++ b/dist/changes-4.7.0.md @@ -103,6 +103,7 @@ Python Support Debugging * Fixed updating of memory view +* Added `Leave Debug Mode` button to toolbar * QML * Added support for nested properties (QTBUG-68474) * Fixed issue with different endianness (QTBUG-68721) @@ -148,6 +149,11 @@ Test Integration * Fixed parsing issue with non-ASCII characters (QTCREATORBUG-20105) * Fixed detection of test name (QTCREATORBUG-20642) +Welcome + +* Rather than open project do nothing when right-clicking recent projects +* Open session mini menu when right-clicking sessions + Platform Specific Windows diff --git a/doc/src/analyze/cpu-usage-analyzer.qdoc b/doc/src/analyze/cpu-usage-analyzer.qdoc index 7e888bd4e1..4588a5a5b6 100644 --- a/doc/src/analyze/cpu-usage-analyzer.qdoc +++ b/doc/src/analyze/cpu-usage-analyzer.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-heob.html \page creator-cpu-usage-analyzer.html \nextpage creator-autotest.html diff --git a/doc/src/analyze/creator-analyze.qdoc b/doc/src/analyze/creator-analyze.qdoc index dac880ac48..a11b2c3617 100644 --- a/doc/src/analyze/creator-analyze.qdoc +++ b/doc/src/analyze/creator-analyze.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-troubleshooting-debugging.html \page creator-analyze-mode.html \nextpage creator-qml-performance-monitor.html diff --git a/doc/src/analyze/creator-clang-static-analyzer.qdoc b/doc/src/analyze/creator-clang-static-analyzer.qdoc index 2c7b59b02a..aebae45cce 100644 --- a/doc/src/analyze/creator-clang-static-analyzer.qdoc +++ b/doc/src/analyze/creator-clang-static-analyzer.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-running-valgrind-remotely.html \page creator-clang-tools.html \nextpage creator-heob.html diff --git a/doc/src/analyze/creator-heob.qdoc b/doc/src/analyze/creator-heob.qdoc index 3fba9aca8f..72c31913d3 100644 --- a/doc/src/analyze/creator-heob.qdoc +++ b/doc/src/analyze/creator-heob.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-clang-tools.html \page creator-heob.html \nextpage creator-cpu-usage-analyzer.html diff --git a/doc/src/analyze/creator-valgrind-overview.qdoc b/doc/src/analyze/creator-valgrind-overview.qdoc index 774c933d75..a10ee3f00e 100644 --- a/doc/src/analyze/creator-valgrind-overview.qdoc +++ b/doc/src/analyze/creator-valgrind-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-qml-performance-monitor.html \page creator-valgrind-overview.html \nextpage creator-analyzer.html diff --git a/doc/src/analyze/creator-valgrind.qdoc b/doc/src/analyze/creator-valgrind.qdoc index e52bd67d70..fb22f8632c 100644 --- a/doc/src/analyze/creator-valgrind.qdoc +++ b/doc/src/analyze/creator-valgrind.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-valgrind-overview.html \page creator-analyzer.html \nextpage creator-cache-profiler.html @@ -140,7 +140,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-analyzer.html \page creator-cache-profiler.html \nextpage creator-running-valgrind-remotely.html @@ -260,7 +260,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-cache-profiler.html \page creator-running-valgrind-remotely.html \nextpage creator-clang-tools.html diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc index a5e27eb000..1b0c5fb333 100644 --- a/doc/src/analyze/qtquick-profiler.qdoc +++ b/doc/src/analyze/qtquick-profiler.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-analyze-mode.html \page creator-qml-performance-monitor.html \nextpage creator-valgrind-overview.html diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 0b2b38aa07..13c449efea 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -25,7 +25,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-connecting-mobile.html \page creator-developing-android.html \nextpage creator-developing-baremetal.html diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index 4dd0f0b3b1..86a58f3b93 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -25,7 +25,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-deployment.html \page creator-deploying-android.html \nextpage creator-deployment-embedded-linux.html diff --git a/doc/src/baremetal/creator-baremetal-dev.qdoc b/doc/src/baremetal/creator-baremetal-dev.qdoc index 7df10419fc..73eaa37ec3 100644 --- a/doc/src/baremetal/creator-baremetal-dev.qdoc +++ b/doc/src/baremetal/creator-baremetal-dev.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -25,7 +25,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-developing-android.html \page creator-developing-baremetal.html \nextpage creator-developing-generic-linux.html diff --git a/doc/src/cmake/creator-projects-cmake.qdoc b/doc/src/cmake/creator-projects-cmake.qdoc index 2a590df8c3..022d8a9af4 100644 --- a/doc/src/cmake/creator-projects-cmake.qdoc +++ b/doc/src/cmake/creator-projects-cmake.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-other.html \page creator-project-cmake.html \nextpage creator-project-qbs.html diff --git a/doc/src/debugger/creator-debugger-example.qdoc b/doc/src/debugger/creator-debugger-example.qdoc index a43afe684c..75d6f633d8 100644 --- a/doc/src/debugger/creator-debugger-example.qdoc +++ b/doc/src/debugger/creator-debugger-example.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debugging-qml.html \page creator-debugging-example.html \nextpage creator-qml-debugging-example.html diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc index 2a5a1a9d1f..e042a51d5b 100644 --- a/doc/src/debugger/creator-debugger-setup.qdoc +++ b/doc/src/debugger/creator-debugger-setup.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debugging.html \page creator-debugger-engines.html \nextpage creator-debugger-operating-modes.html diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index fee04684b8..2fcad93e12 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-testing.html \page creator-debugging.html \nextpage creator-debugger-engines.html @@ -98,7 +98,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debugger-engines.html \page creator-debugger-operating-modes.html \nextpage creator-debug-mode.html @@ -352,7 +352,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debugger-operating-modes.html \page creator-debug-mode.html \nextpage creator-debugging-helpers.html @@ -928,7 +928,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debug-mode.html \page creator-debugging-helpers.html \nextpage creator-debugging-qml.html @@ -1526,7 +1526,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-qml-debugging-example.html \page creator-troubleshooting-debugging.html \nextpage creator-analyze-mode.html diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc index e64ccc5d38..5643fc3f82 100644 --- a/doc/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/src/debugger/qtquick-debugger-example.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debugging-example.html \page creator-qml-debugging-example.html \nextpage creator-troubleshooting-debugging.html diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc index 5862142c29..a708a82c34 100644 --- a/doc/src/debugger/qtquick-debugging.qdoc +++ b/doc/src/debugger/qtquick-debugging.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debugging-helpers.html \page creator-debugging-qml.html \nextpage creator-debugging-example.html diff --git a/doc/src/editors/creator-beautifier.qdoc b/doc/src/editors/creator-beautifier.qdoc index 52662b53c9..7c2c87879d 100644 --- a/doc/src/editors/creator-beautifier.qdoc +++ b/doc/src/editors/creator-beautifier.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-refactoring.html \page creator-beautifier.html \nextpage creator-editor-options.html diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc index 60b5be29b6..9cf15ab4dd 100644 --- a/doc/src/editors/creator-clang-codemodel.qdoc +++ b/doc/src/editors/creator-clang-codemodel.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-diff-editor.html \page creator-clang-codemodel.html \nextpage creator-finding-overview.html diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc index cc1bde94bd..0147f20c64 100644 --- a/doc/src/editors/creator-coding-edit-mode.qdoc +++ b/doc/src/editors/creator-coding-edit-mode.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-functions.html \page creator-coding-navigating.html \nextpage creator-highlighting.html diff --git a/doc/src/editors/creator-coding.qdoc b/doc/src/editors/creator-coding.qdoc index 3b6bddfb9f..234d203ea4 100644 --- a/doc/src/editors/creator-coding.qdoc +++ b/doc/src/editors/creator-coding.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-usability.html \page creator-coding.html \nextpage creator-editor-functions.html diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index 78c1c0274e..efd2005405 100644 --- a/doc/src/editors/creator-diff-editor.qdoc +++ b/doc/src/editors/creator-diff-editor.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-macros.html \page creator-diff-editor.html \nextpage creator-clang-codemodel.html diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/src/editors/creator-editors-options-text.qdoc index 3e78459a88..63401f25b1 100644 --- a/doc/src/editors/creator-editors-options-text.qdoc +++ b/doc/src/editors/creator-editors-options-text.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-options.html \page creator-editor-options-text.html \nextpage creator-editor-fakevim.html diff --git a/doc/src/editors/creator-editors-options.qdoc b/doc/src/editors/creator-editors-options.qdoc index 4205eaa9c4..4e7305d58d 100644 --- a/doc/src/editors/creator-editors-options.qdoc +++ b/doc/src/editors/creator-editors-options.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-beautifier.html \page creator-editor-options.html \nextpage creator-editor-options-text.html diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc index 6524880a51..2ecbf04d64 100644 --- a/doc/src/editors/creator-editors-writing-code.qdoc +++ b/doc/src/editors/creator-editors-writing-code.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-coding.html \page creator-editor-functions.html \nextpage creator-coding-navigating.html diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index b7297ed7d7..c27a787c58 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-coding-navigating.html \page creator-highlighting.html \nextpage creator-checking-code-syntax.html @@ -157,7 +157,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-highlighting.html \page creator-checking-code-syntax.html \nextpage creator-completing-code.html @@ -839,7 +839,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-checking-code-syntax.html \page creator-completing-code.html \nextpage creator-indenting-code.html @@ -1066,7 +1066,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage qt-quick-toolbars.html \page creator-editor-codepasting.html \nextpage creator-macros.html @@ -1159,7 +1159,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-codepasting.html \page creator-macros.html \nextpage creator-diff-editor.html @@ -1196,7 +1196,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-options-text.html \page creator-editor-fakevim.html \nextpage creator-mime-types.html @@ -1401,7 +1401,7 @@ */ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-completing-code.html \page creator-indenting-code.html \nextpage qt-quick-toolbars.html @@ -1668,7 +1668,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-finding-overview.html \page creator-editor-finding.html \nextpage creator-editor-locator.html @@ -1917,7 +1917,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-locator.html \page creator-editor-refactoring.html \nextpage creator-beautifier.html @@ -2767,7 +2767,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-finding.html \page creator-editor-locator.html \nextpage creator-editor-refactoring.html diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc index 5cd97cd982..4841291419 100644 --- a/doc/src/editors/creator-finding.qdoc +++ b/doc/src/editors/creator-finding.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-clang-codemodel.html \page creator-finding-overview.html \nextpage creator-editor-finding.html diff --git a/doc/src/editors/creator-mime-types.qdoc b/doc/src/editors/creator-mime-types.qdoc index 7be599f879..251f419514 100644 --- a/doc/src/editors/creator-mime-types.qdoc +++ b/doc/src/editors/creator-mime-types.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-fakevim.html \page creator-mime-types.html \nextpage creator-modeling.html diff --git a/doc/src/editors/creator-modeling.qdoc b/doc/src/editors/creator-modeling.qdoc index e4a3caf096..9b5dc4e165 100644 --- a/doc/src/editors/creator-modeling.qdoc +++ b/doc/src/editors/creator-modeling.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-mime-types.html \page creator-modeling.html \nextpage creator-scxml.html diff --git a/doc/src/editors/creator-scxml.qdoc b/doc/src/editors/creator-scxml.qdoc index b05730ee50..b0a942279a 100644 --- a/doc/src/editors/creator-scxml.qdoc +++ b/doc/src/editors/creator-scxml.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -44,7 +44,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-modeling.html \page creator-scxml.html \nextpage creator-building-running.html diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-autotest.qdoc index 08273d019c..76e352d7d1 100644 --- a/doc/src/howto/creator-autotest.qdoc +++ b/doc/src/howto/creator-autotest.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-cpu-usage-analyzer.html \page creator-autotest.html \nextpage creator-advanced.html diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc index 8cfb2b7dc5..8fec737678 100644 --- a/doc/src/howto/creator-cli.qdoc +++ b/doc/src/howto/creator-cli.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-generic.html \page creator-cli.html \nextpage creator-keyboard-shortcuts.html diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc index 93833dccf1..b7f911dcd9 100644 --- a/doc/src/howto/creator-external-tools.qdoc +++ b/doc/src/howto/creator-external-tools.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-keyboard-shortcuts.html \page creator-editor-external.html \nextpage creator-task-lists.html diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc index 5521d826c9..8fabed0252 100644 --- a/doc/src/howto/creator-help.qdoc +++ b/doc/src/howto/creator-help.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-help-overview.html \page creator-help.html \nextpage creator-faq.html diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc index 75ee2adae9..4a6ba7b056 100644 --- a/doc/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-cli.html \page creator-keyboard-shortcuts.html \nextpage creator-editor-external.html diff --git a/doc/src/howto/creator-sessions.qdoc b/doc/src/howto/creator-sessions.qdoc index bb627e607e..bbd4092239 100644 --- a/doc/src/howto/creator-sessions.qdoc +++ b/doc/src/howto/creator-sessions.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-sharing-project-settings.html \page creator-project-managing-sessions.html \nextpage creator-design-mode.html diff --git a/doc/src/howto/creator-task-lists.qdoc b/doc/src/howto/creator-task-lists.qdoc index 88aaea1278..7c007f0e43 100644 --- a/doc/src/howto/creator-task-lists.qdoc +++ b/doc/src/howto/creator-task-lists.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-external.html \page creator-task-lists.html \nextpage creator-help-overview.html diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-tips.qdoc index 5b0b5919ad..8033454497 100644 --- a/doc/src/howto/creator-tips.qdoc +++ b/doc/src/howto/creator-tips.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-faq.html \page creator-tips.html \nextpage creator-known-issues.html diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index f753e9054a..7ce33a3614 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-overview.html \page creator-quick-tour.html \nextpage creator-configuring.html diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc index 915f2c0c1a..5110f7f95e 100644 --- a/doc/src/howto/qtcreator-faq.qdoc +++ b/doc/src/howto/qtcreator-faq.qdoc @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-help.html \page creator-faq.html \nextpage creator-tips.html diff --git a/doc/src/ios/creator-ios-dev.qdoc b/doc/src/ios/creator-ios-dev.qdoc index 5b2aacd0fd..ba67111ea2 100644 --- a/doc/src/ios/creator-ios-dev.qdoc +++ b/doc/src/ios/creator-ios-dev.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -25,7 +25,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-developing-generic-linux.html \page creator-developing-ios.html \nextpage creator-developing-qnx.html diff --git a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc index 53c6bf0694..346f48a42a 100644 --- a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc +++ b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-deploying-android.html \page creator-deployment-embedded-linux.html \nextpage creator-deployment-qnx.html diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 7dace43197..f323e488a7 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -25,7 +25,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-developing-baremetal.html \page creator-developing-generic-linux.html \nextpage creator-developing-ios.html diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc index 3687482108..f8f7d3dc4b 100644 --- a/doc/src/overview/creator-acknowledgements.qdoc +++ b/doc/src/overview/creator-acknowledgements.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage technical-support.html \page creator-acknowledgements.html diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-advanced.qdoc index 7d480e6660..27db06538d 100644 --- a/doc/src/overview/creator-advanced.qdoc +++ b/doc/src/overview/creator-advanced.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-autotest.html \page creator-advanced.html \nextpage creator-os-supported-platforms.html diff --git a/doc/src/overview/creator-commercial-overview.qdoc b/doc/src/overview/creator-commercial-overview.qdoc index ea1d7aa32f..6822c45bd2 100644 --- a/doc/src/overview/creator-commercial-overview.qdoc +++ b/doc/src/overview/creator-commercial-overview.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \page creator-commercial-overview.html \title Commercial Features diff --git a/doc/src/overview/creator-configuring.qdoc b/doc/src/overview/creator-configuring.qdoc index 81b540fdea..67640c0081 100644 --- a/doc/src/overview/creator-configuring.qdoc +++ b/doc/src/overview/creator-configuring.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-quick-tour.html \page creator-configuring.html \nextpage creator-build-example-application.html diff --git a/doc/src/overview/creator-deployment-overview.qdoc b/doc/src/overview/creator-deployment-overview.qdoc index a94b1af2de..86fbaa5488 100644 --- a/doc/src/overview/creator-deployment-overview.qdoc +++ b/doc/src/overview/creator-deployment-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-running-targets.html \page creator-deployment.html \nextpage creator-deploying-android.html diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-design-overview.qdoc index 29c229c632..9b2537a356 100644 --- a/doc/src/overview/creator-design-overview.qdoc +++ b/doc/src/overview/creator-design-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-managing-sessions.html \page creator-design-mode.html \nextpage creator-visual-editor.html diff --git a/doc/src/overview/creator-getting-started.qdoc b/doc/src/overview/creator-getting-started.qdoc index 23f1027a84..02eee1e2b0 100644 --- a/doc/src/overview/creator-getting-started.qdoc +++ b/doc/src/overview/creator-getting-started.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage index.html \page creator-getting-started.html \nextpage creator-overview.html diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-glossary.qdoc index 29af7ef001..5ddee7b0b0 100644 --- a/doc/src/overview/creator-glossary.qdoc +++ b/doc/src/overview/creator-glossary.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-known-issues.html \page creator-glossary.html \nextpage technical-support.html diff --git a/doc/src/overview/creator-help-overview.qdoc b/doc/src/overview/creator-help-overview.qdoc index ba2c0977e5..cb36664bc9 100644 --- a/doc/src/overview/creator-help-overview.qdoc +++ b/doc/src/overview/creator-help-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-task-lists.html \page creator-help-overview.html \nextpage creator-help.html diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc index f91f214c93..16c5263aee 100644 --- a/doc/src/overview/creator-issues.qdoc +++ b/doc/src/overview/creator-issues.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-tips.html \page creator-known-issues.html \nextpage creator-glossary.html diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index e690ac14d1..ae7aa0a284 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-deployment-qnx.html \page creator-connecting-mobile.html \nextpage creator-developing-android.html diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc index def22ce883..c732d2d3d8 100644 --- a/doc/src/overview/creator-overview.qdoc +++ b/doc/src/overview/creator-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-getting-started.html \page creator-overview.html \nextpage creator-quick-tour.html diff --git a/doc/src/overview/creator-supported-platforms.qdoc b/doc/src/overview/creator-supported-platforms.qdoc index 43118e4c8d..8334f9a800 100644 --- a/doc/src/overview/creator-supported-platforms.qdoc +++ b/doc/src/overview/creator-supported-platforms.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-advanced.html \page creator-os-supported-platforms.html \nextpage creator-project-other.html diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index 8b8fa53555..ab8e45cf3b 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-glossary.html \page technical-support.html \nextpage creator-acknowledgements.html diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-testing.qdoc index 28a8e5d5c0..39bae4ba17 100644 --- a/doc/src/overview/creator-testing.qdoc +++ b/doc/src/overview/creator-testing.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-build-process-customizing.html \page creator-testing.html \nextpage creator-debugging.html diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc index 65a151a753..2454f4db4b 100644 --- a/doc/src/overview/creator-tutorials.qdoc +++ b/doc/src/overview/creator-tutorials.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-build-example-application.html \page creator-tutorials.html \nextpage {Creating a Qt Quick Application} diff --git a/doc/src/overview/mobile-app-design.qdoc b/doc/src/overview/mobile-app-design.qdoc index ccb635821c..b627c35a8d 100644 --- a/doc/src/overview/mobile-app-design.qdoc +++ b/doc/src/overview/mobile-app-design.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage adding-plugins.html \page creator-usability.html \nextpage creator-coding.html diff --git a/doc/src/projects/creator-projects-autotools.qdoc b/doc/src/projects/creator-projects-autotools.qdoc index 6efd5ef48d..4594179afc 100644 --- a/doc/src/projects/creator-projects-autotools.qdoc +++ b/doc/src/projects/creator-projects-autotools.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Author: Peter Penz (ppenz@openismus.com) ** Auther: Patricia Santana Cruz (patriciasantanacruz@gmail.com) ** Contact: https://www.qt.io/licensing/ @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-qbs.html \page creator-projects-autotools.html \nextpage creator-project-generic.html diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc index 4cdc509070..f2583b6552 100644 --- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc +++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-configuring.html \page creator-build-example-application.html \nextpage creator-tutorials.html diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc index 0bad761ecf..656be23bd5 100644 --- a/doc/src/projects/creator-projects-building-running.qdoc +++ b/doc/src/projects/creator-projects-building-running.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-scxml.html \page creator-building-running.html \nextpage creator-building-targets.html diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-projects-building.qdoc index c8ab421a01..c5a9ae001e 100644 --- a/doc/src/projects/creator-projects-building.qdoc +++ b/doc/src/projects/creator-projects-building.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-building-running.html \page creator-building-targets.html \nextpage creator-running-targets.html diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index a18e7b9dac..c59182e2f9 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-developing-qnx.html \page creator-build-process-customizing.html \nextpage creator-testing.html diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-projects-compilers.qdoc index d6e074d4d2..0e3f89c326 100644 --- a/doc/src/projects/creator-projects-compilers.qdoc +++ b/doc/src/projects/creator-projects-compilers.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-qmake.html \page creator-tool-chains.html \nextpage creator-debuggers.html diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc index 991f409c50..713ab39d61 100644 --- a/doc/src/projects/creator-projects-creating.qdoc +++ b/doc/src/projects/creator-projects-creating.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-managing.html \page creator-project-creating.html \nextpage creator-project-opening.html diff --git a/doc/src/projects/creator-projects-custom-wizards-json.qdoc b/doc/src/projects/creator-projects-custom-wizards-json.qdoc index 2f4a7081ce..9e90847774 100644 --- a/doc/src/projects/creator-projects-custom-wizards-json.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards-json.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-wizards.html \page creator-project-wizards-json.html \nextpage creator-project-wizards-xml.html diff --git a/doc/src/projects/creator-projects-custom-wizards-xml.qdoc b/doc/src/projects/creator-projects-custom-wizards-xml.qdoc index 2cb3244e74..9e87416440 100644 --- a/doc/src/projects/creator-projects-custom-wizards-xml.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards-xml.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-wizards-json.html \page creator-project-wizards-xml.html \nextpage creator-version-control.html diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc index d5cabf06f4..427c40fd8e 100644 --- a/doc/src/projects/creator-projects-custom-wizards.qdoc +++ b/doc/src/projects/creator-projects-custom-wizards.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-qmake-libraries.html \page creator-project-wizards.html \nextpage creator-project-wizards-json.html diff --git a/doc/src/projects/creator-projects-debuggers.qdoc b/doc/src/projects/creator-projects-debuggers.qdoc index 378195ee3b..6e9b3013f9 100644 --- a/doc/src/projects/creator-projects-debuggers.qdoc +++ b/doc/src/projects/creator-projects-debuggers.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-tool-chains.html \page creator-debuggers.html \nextpage creator-build-settings.html diff --git a/doc/src/projects/creator-projects-generic.qdoc b/doc/src/projects/creator-projects-generic.qdoc index c4950c0f6e..dd04f75890 100644 --- a/doc/src/projects/creator-projects-generic.qdoc +++ b/doc/src/projects/creator-projects-generic.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-projects-autotools.html \page creator-project-generic.html \nextpage creator-cli.html diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-projects-libraries.qdoc index 115e58fed1..a29ea16293 100644 --- a/doc/src/projects/creator-projects-libraries.qdoc +++ b/doc/src/projects/creator-projects-libraries.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-opening.html \page creator-project-qmake-libraries.html \nextpage creator-project-wizards.html diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-projects-opening.qdoc index 2c2ce8c32e..7fe17582ef 100644 --- a/doc/src/projects/creator-projects-opening.qdoc +++ b/doc/src/projects/creator-projects-opening.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-creating.html \page creator-project-opening.html \nextpage creator-project-qmake-libraries.html diff --git a/doc/src/projects/creator-projects-other.qdoc b/doc/src/projects/creator-projects-other.qdoc index 1136901ed3..7b66413535 100644 --- a/doc/src/projects/creator-projects-other.qdoc +++ b/doc/src/projects/creator-projects-other.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-os-supported-platforms.html \page creator-project-other.html \nextpage creator-project-cmake.html diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc index b002fae0e9..3c19d593f6 100644 --- a/doc/src/projects/creator-projects-overview.qdoc +++ b/doc/src/projects/creator-projects-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage accelbubble \page creator-project-managing.html \nextpage creator-project-creating.html diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc index 4d0f088b41..d008763118 100644 --- a/doc/src/projects/creator-projects-qbs.qdoc +++ b/doc/src/projects/creator-projects-qbs.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-cmake.html \page creator-project-qbs.html \nextpage creator-projects-autotools.html diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc index 01eccaef7b..f0bff5d0bf 100644 --- a/doc/src/projects/creator-projects-qt-versions.qdoc +++ b/doc/src/projects/creator-projects-qt-versions.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-targets.html \page creator-project-qmake.html \nextpage creator-tool-chains.html diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 875946bb50..5e794f9bfb 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-building-targets.html \page creator-running-targets.html \nextpage creator-deployment.html diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc index 81471b2cc7..1d65f4193c 100644 --- a/doc/src/projects/creator-projects-settings-build.qdoc +++ b/doc/src/projects/creator-projects-settings-build.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-debuggers.html \page creator-build-settings.html \nextpage creator-run-settings.html diff --git a/doc/src/projects/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-projects-settings-code-style.qdoc index 8479124a00..4e3841b4d2 100644 --- a/doc/src/projects/creator-projects-settings-code-style.qdoc +++ b/doc/src/projects/creator-projects-settings-code-style.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-editor-settings.html \page creator-code-style-settings.html \nextpage creator-build-dependencies.html diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-projects-settings-dependencies.qdoc index 51c2c7f0a4..fe6ffe9a01 100644 --- a/doc/src/projects/creator-projects-settings-dependencies.qdoc +++ b/doc/src/projects/creator-projects-settings-dependencies.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-code-style-settings.html \page creator-build-dependencies.html \nextpage creator-sharing-project-settings.html diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc index c3ea91b00d..76c051d1e5 100644 --- a/doc/src/projects/creator-projects-settings-editor.qdoc +++ b/doc/src/projects/creator-projects-settings-editor.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-run-settings.html \page creator-editor-settings.html \nextpage creator-code-style-settings.html diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-projects-settings-overview.qdoc index 687a2df6d1..0c6d09539a 100644 --- a/doc/src/projects/creator-projects-settings-overview.qdoc +++ b/doc/src/projects/creator-projects-settings-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-subversion.html \page creator-configuring-projects.html \nextpage creator-targets.html diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc index ac853f3b16..4a65bd4663 100644 --- a/doc/src/projects/creator-projects-settings-run.qdoc +++ b/doc/src/projects/creator-projects-settings-run.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-build-settings.html \page creator-run-settings.html \nextpage creator-editor-settings.html diff --git a/doc/src/projects/creator-projects-settings-sharing.qdoc b/doc/src/projects/creator-projects-settings-sharing.qdoc index 2f4983e472..6334103211 100644 --- a/doc/src/projects/creator-projects-settings-sharing.qdoc +++ b/doc/src/projects/creator-projects-settings-sharing.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-build-dependencies.html \page creator-sharing-project-settings.html \nextpage creator-project-managing-sessions.html diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index 20af2a2f27..caf16fb31f 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-configuring-projects.html \page creator-targets.html \nextpage creator-project-qmake.html diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc index 90c36930a9..2b266f877a 100644 --- a/doc/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/src/qnx/creator-deployment-qnx.qdoc @@ -2,7 +2,7 @@ ** ** This file is part of Qt Creator ** -** Copyright (C) 2016 Blackberry +** Copyright (C) 2018 Blackberry ** ** Contact: Blackberry (qt@blackberry.com) ** Contact: KDAB (info@kdab.com) @@ -34,7 +34,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-deployment-embedded-linux.html \page creator-deployment-qnx.html \nextpage creator-connecting-mobile.html diff --git a/doc/src/qnx/creator-developing-qnx.qdoc b/doc/src/qnx/creator-developing-qnx.qdoc index 5eab609be8..c3ad2b19d6 100644 --- a/doc/src/qnx/creator-developing-qnx.qdoc +++ b/doc/src/qnx/creator-developing-qnx.qdoc @@ -2,7 +2,7 @@ ** ** This file is part of Qt Creator ** -** Copyright (C) 2016 Blackberry +** Copyright (C) 2018 Blackberry ** ** Contact: Blackberry (qt@blackberry.com) ** Contact: KDAB (info@kdab.com) @@ -29,7 +29,7 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-developing-ios.html \page creator-developing-qnx.html \nextpage creator-build-process-customizing.html diff --git a/doc/src/qtcreator-toc.qdoc b/doc/src/qtcreator-toc.qdoc index 0f30047180..119d5f1d92 100644 --- a/doc/src/qtcreator-toc.qdoc +++ b/doc/src/qtcreator-toc.qdoc @@ -88,6 +88,13 @@ \li \l {Creating Qt Quick Projects} \li \l {Qt Quick UI Forms} \li \l {Editing QML Files in Design Mode} + \li \l {Creating Components} + \list + \li \l {Creating Buttons} + \li \l {Creating Scalable Buttons and Borders} + \endlist + \li \l {Managing Item Hierarchy} + \li \l {Specifying Item Properties} \li \l {Editing PathView Properties} \li \l {Adding Connections} \list @@ -97,10 +104,6 @@ \li \l{Managing C++ Backend Objects} \endlist \li \l {Adding States} - \li \l {Creating Components} - \li \l {Creating Buttons} - \li \l {Creating Scalable Buttons and Borders} - \li \l {Creating Screens} \li \l {Browsing ISO 7000 Icons} \li \l {Exporting Designs from Graphics Software} \li \l {Using QML Modules with Plugins} diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc index f580ea7d06..fd013f9be3 100644 --- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-writing-program.html \example accelbubble \nextpage creator-project-managing.html diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc index 855f2c7150..7890a1d538 100644 --- a/doc/src/qtquick/qtquick-app-development.qdoc +++ b/doc/src/qtquick/qtquick-app-development.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-design-mode.html \page creator-visual-editor.html \nextpage quick-projects.html @@ -56,6 +56,22 @@ \uicontrol {Text Editor} in the Design mode to develop Qt Quick applications. + \li \l {Creating Components} + + You can use basic QML types to create your own components that you + can combine with ready-made Qt Quick Controls 2 and Layouts + (available since Qt 5.7). + + \li \l {Managing Item Hierarchy} + + You can manage the items in the current QML file and their + relationships in the \uicontrol Navigator. + + \li \l {Specifying Item Properties} + + You can specify properties for your components in the + \uicontrol Properties pane. + \li \l {Editing PathView Properties} You can use a graphical spline editor to specify \l{PathView} paths. @@ -66,16 +82,11 @@ You can connect objects to signals, specify dynamic properties for objects, and create bindings between the properties of two objects. - \li \l {Creating Components} - - You can use basic QML types to create your own components that you - can combine with ready-made Qt Quick Controls 2 and Layouts - (available since Qt 5.7). - \li \l {Creating Screens} + \li \l {Adding States} - You can combine basic QML types with ready-made Qt Quick Controls 2, - Dialogs, and Layouts (available since Qt 5.7) to create screens. You - can use states and transitions to navigate between screens. + You can use states to describe user interface configurations, such + as the UI controls, their properties and behavior, and the available + actions. \li \l {Browsing ISO 7000 Icons} diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 7809916e82..829b8aee9c 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-tutorials.html \example transitions \nextpage creator-writing-program.html diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index b924e801da..00a09a7ccc 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage quick-components.html \page quick-buttons.html \nextpage quick-scalable-image.html @@ -115,10 +115,10 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage quick-buttons.html \page quick-scalable-image.html - \nextpage quick-screens.html + \nextpage qtquick-navigator.html \title Creating Scalable Buttons and Borders diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index 31af869be8..2ee7edca42 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,9 +30,8 @@ // ********************************************************************** /*! - - \contentspage {Qt Creator Manual} - \previouspage quick-states.html + \contentspage index.html + \previouspage creator-using-qt-quick-designer.html \page quick-components.html \nextpage quick-buttons.html @@ -42,43 +41,364 @@ that you can re-use in other QML files. A component is like a black box; it interacts with the outside world through properties, signals, and slots, and is generally defined in its own QML file. You can import components to - screens and applications. + applications. + + The \uicontrol {Library} pane lists the available QML types, UI + components, resources, and imports. + + \image qmldesigner-qml-components.png "QML Components" + + The \uicontrol {QML Types} tab displays the QML types grouped by category: + your own QML components, basic types, layouts, positioner types, and views. + + Sets of UI components with the look and feel of a particular mobile device + platform have been defined for Qt Quick 1. Since Qt 5.1, ready-made Qt + Quick Controls, Dialogs, and Layouts are available for creating user + interfaces using Qt Quick 2. The components and controls are based on + standard QML types. To view the components and controls in the + \uicontrol {Library}, import the component sets in \uicontrol Imports. + + The \uicontrol {Qt Quick Application} wizards for a particular platform add + the import statements automatically. You can remove import statements in + \uicontrol Imports + + \uicontrol {Resources} displays the images and other files that you copy + to the project folder (to the same subfolder as the QML files). + + \section1 Adding Components to Designs + + \image qmldesigner-visual-editor.png "Design mode" + + \list 1 + \li Drag and drop components from the \uicontrol Library (2) to the + \uicontrol Navigator (3) or \uicontrol {Form Editor} (1). + \li Select components in the \uicontrol Navigator to edit their + properties in the \uicontrol Properties pane (4). For more + information, see \l {Specifying Item Properties}. + \li Connect components to signals or create bindings between components + in the \uicontrol Connections pane (5). For more information, see + \l{Adding Connections}. + \li Add states to apply sets of changes to the properties of one or + several components in the \uicontrol States pane (6). For more + information, see \l{Adding States}. + \endlist + + \section1 Using Basic QML Types You can use the following QML types to create components: \list + \li \l [QML]{BorderImage}{Border Image} uses an image as a border or + background. + \li \l [QML]{Image} adds a bitmap to the scene. You can stretch and + tile images. + \li \l [QML]{Item} is the most basic of all visual types in QML. Even + though it has no visual appearance, it defines all the properties + that are common across visual types, such as the x and y position, + width and height, anchoring, and key handling. + \li \l [QML]{Rectangle} adds a rectangle that is painted with a solid + fill color and an optional border. You can use the radius property + to create rounded rectangles. + \li \l [QML]{Text} adds formatted read-only text. + \li \l [QML]{TextEdit}{Text Edit} adds a single line of editable + formatted text that can be validated. + \li \l [QML]{TextInput}{Text Input} adds a single line of editable + plain text that can be validated. + \endlist - \li \l [QML]{BorderImage}{Border Image} uses an image as a border or background. + \section1 Using Data Models - \li \l [QML]{Image} - adds a bitmap to the scene. You can stretch and tile images. + You can create the following types of views to organize items provided by + \l{Models and Views in Qt Quick}{data models}: - \li \l [QML]{Item} - is the most basic of all visual types in QML. Even though it has no - visual appearance, it defines all the properties that are common - across visual types, such as the x and y position, width and height, - anchoring, and key handling. + \list + \li \l{GridView}{Grid View} provides a grid vizualization of a model. + \li \l{ListView}{List View} provides a list vizualization of a model. + \li \l{PathView}{Path View} visualizes the contents of a model along a + path. + \endlist - \li \l [QML]{Rectangle} - adds a rectangle that is painted with a solid fill color and an - optional border. You can also use the radius property to create - rounded rectangles. + When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or + \l{PathView}{Path View}, the ListModel and the delegate component that + creates an instance for each item in the model are added automatically. + You can edit item properties in the \uicontrol Properties pane or + in the \uicontrol {Text Editor}. You can also replace the default model and + delegate with other, more complex models and delegates in the + \uicontrol {Text Editor}. - \li \l [QML]{Text} adds formatted read-only text. + \section1 Positioning Items on Screens + + The position of an item on the canvas can be either absolute or relative + to other items. If you are designing a static user interface, + \l{Important Concepts In Qt Quick - Positioning#manual-positioning} + {manual positioning} provides the most efficient form of positioning items + on the screen. For a dynamic user interface, you can employ the following + positioning methods provided by Qt Quick: + + \list + \li \l{Setting Bindings} + \li \l{Setting Anchors and Margins} + \li \l{Using Positioners} + \li \l{Using Layouts} + \li \l{Organizing Items} + \endlist + + \section2 Setting Bindings + + \l{Positioning with Bindings} {Property binding} is a declarative way of + specifying the value of a property. Binding allows a property value to be + expressed as a JavaScript expression that defines the value relative to + other property values or data accessible in the application. The property + value is automatically kept up to date if the other properties or data + values change. + + Property bindings are created implicitly in QML whenever a property is + assigned a JavaScript expression. To set JavaScript expressions as values + of properties in the Design mode, select the \uicontrol Nut menu next to + a property, and then select \uicontrol {Set Binding}. + + \image qmldesigner-set-expression.png "Type properties context menu" + + The \uicontrol {Binding Editor} supports code completion. Start typing a + string and press \key Ctrl+Space to display a list of properties, IDs, and + code snippets. When you enter a period (.) after a property name, a list of + available values is displayed. Press \key Enter to accept the first + suggestion in the list and to complete the code. + + \image qmldesigner-binding-editor.png "Binding Editor" + + To remove bindings, select \uicontrol Reset in the context menu. + + You can set bindings also in the \uicontrol Connections view. For more + information, see \l {Adding Bindings Between Properties}. + + For more information on the JavaScript environment provided by QML, see + \l{Integrating QML and JavaScript}. + + Bindings are a black box for the Design mode and using them might have a + negative impact on performance, so consider setting anchors and margins for + items, instead. For example, instead of setting \c {parent.width} for an + item, you could anchor the item to its sibling items on the left and the + right. + + \section2 Setting Anchors and Margins + + In an \l{Important Concepts In Qt Quick - Positioning#anchors} + {anchor-based} layout, each QML type can be thought of as having a set of + invisible \e anchor lines: top, bottom, left, right, fill, horizontal + center, vertical center, and baseline. + + In the \uicontrol Layout pane you can set anchors and margins for items. To + set the anchors of an item, click the anchor buttons. You can combine the + top/bottom, left/right, and horizontal/vertical anchors to anchor items in + the corners of the parent item or center them horizontally or vertically + within the parent item. + + \image qmldesigner-anchor-buttons.png "Anchor buttons" + + For convenience, you can click the \inlineimage anchor_fill.png + (\uicontrol {Fill to Parent}) toolbar button to apply fill anchors to an + item and the \inlineimage qtcreator-anchors-reset-icon.png + (\uicontrol {Reset Anchors}) button to reset the anchors to their saved + state. + + You can specify the baseline anchor in the \uicontrol {Text Editor} in the + Design mode. - \li \l [QML]{TextEdit}{Text Edit} - adds a single line of editable formatted text that can be validated. + For performance reasons, you can only anchor an item to its siblings + and direct parent. By default, an item is anchored to its parent when + you use the anchor buttons. Select a sibling of the item in the + \uicontrol Target field to anchor to it, instead. - \li \l [QML]{TextInput}{Text Input} - adds a single line of editable plain text that can be validated. + Arbitrary anchoring is not supported. For example, you cannot specify: + \c {anchor.left: parent.right}. You have to specify: + \c {anchor.left: parent.left}. When you use the anchor buttons, anchors to + the parent item are always specified to the same side. However, anchors to + sibling items are specified to the opposite side: + \c {anchor.left: sibling.right}. This allows you to keep sibling items + together. - \omit - \li \l{WebView} adds web content to a canvas. - \endomit + In the following image, \uicontrol{Rectangle 2} is anchored to + \uicontrol {Rectangle 1} on its left and to the bottom of its parent. + \image qmldesigner-anchors.png "Anchoring sibling items" + + The anchors for \uicontrol{Rectangle 2} are specified as follows in code: + + \qml + Rectangle { + id: rectangle2 + anchors.left: rectangle1.right + anchors.leftMargin: 15 + anchors.bottom: parent.bottom + anchors.bottomMargin: 15 + // + } + \endqml + + Margins specify the amount of empty space to leave to the outside of an + item. Margins only have meaning for anchors. They do not take any effect + when using layouts or absolute positioning. + + \section2 Using Positioners + + \l{Important Concepts In Qt Quick - Positioning#positioners} + {Positioner items} are container items that manage the positions of items + in a declarative user interface. Positioners behave in a similar way to + the layout managers used with standard Qt widgets, except that they are + also containers in their own right. + + You can use the following positioners to arrange items on screens: + + \list + \li \l[QML] {Column} arranges its child items vertically. + \li \l[QML] {Row} arranges its child items horizontally. + \li \l[QML] {Grid} + arranges its child items so that they are aligned in a grid and + are not overlapping. + \li \l[QML] {Flow} + arranges its child items side by side, wrapping as necessary. + \endlist + + To lay out several items in a \uicontrol Column, \uicontrol Row, + \uicontrol Grid, or \uicontrol Flow, select the items on the canvas, and + then select \uicontrol Layout in the context menu. + + \section2 Using Layouts + + Since Qt 5.1, you can use QML types in the \l{qtquicklayouts-index.html} + {Qt Quick Layouts} module to arrange Qt Quick items on screens. Unlike + positioners, they manage both the positions and sizes of items in a + declarative interface. They are well suited for resizable user interfaces. + + You can use the following layout types to arrange items on screens: + + \list + \li \l{Layout} provides attached properties for items pushed onto a + \uicontrol {Column Layout}, \uicontrol {Row Layout}, or + \uicontrol {Grid Layout}. + \li \l{ColumnLayout}{Column Layout} provides a grid layout with only + one column. + \li \l{RowLayout}{Row Layout} provides a grid layout with only one row. + \li \l{GridLayout}{Grid Layout} provides a way of dynamically arranging + items in a grid. + \li \l{StackLayout}{Stack Layout} provides a stack of items where only + one item is visible at a time. + \endlist + + To lay out several items in a \uicontrol {Column Layout}, + \uicontrol {Row Layout}, \uicontrol {Grid Layout}, or + \uicontrol {Stack Layout}, select the items in the \uicontrol {Form Editor}, + and then select \uicontrol Layout in the context menu. + + You can also click the \inlineimage column.png + (\uicontrol {Column Layout}), \inlineimage row.png + (\uicontrol {Row Layout}), and \inlineimage grid.png + (\uicontrol {Grid Layout}) toolbar buttons to apply + layouts to the selected items. + + To make an item within a layout as wide as possible while respecting + the given constraints, select the item on the canvas and then select + \uicontrol Layout > \uicontrol {Fill Width} in the context menu. To + make the item as high as possible, select \uicontrol {Fill Height}. + + \section2 Editing Stack Layouts + + \image qtquick-designer-stacked-view.png + + To add items to a \uicontrol {Stack Layout}, select the + \inlineimage plus.png + button next to the type name in the \uicontrol {Form Editor}. To move + between items, select the \inlineimage prev.png + (\uicontrol Previous) and \inlineimage next.png + (\uicontrol Next) buttons. + + To add a tab bar to a stack layout, select \uicontrol {Stacked Container} > + \uicontrol {Add Tab Bar}. + + To raise or lower the stacking order of an item, select + \uicontrol {Stacked Container} > \uicontrol {Increase Index} or + \uicontrol {Decrease Index}. + + \section2 Organizing Items + + Since Qt 5.7, you can use the following \l{Qt Quick Controls 2} types to + organize items on screens: + + \list + \li \l [QtQuickControls2]{Frame} places a logical group of controls + within a visual frame. + \li \l [QtQuickControls2]{GroupBox}{Group Box} is used to lay out a + logical group of controls together, within a titled visual frame. + \li \l [QtQuickControls2]{Label} is a text label with inherited styling + and font. + \li \l [QtQuickControls2]{PageIndicator}{Page Indicator} indicates the + currently active page. + \li \l [QtQuickControls2]{Pane} provides a background matching with the + application style and theme. + \endlist + + \section1 Adding User Interaction Methods + + You can use the following QML types to add basic interaction methods to + screens: + + \list + \li \l{Flickable} + items can be flicked horizontally or vertically. + \li \l{FocusScope}{Focus Scope} + assists in keyboard focus handling when building reusable QML + components. + \li \l [QML]{MouseArea}{Mouse Area} enables simple mouse handling. + \endlist + + Since Qt 5.7, you can also use the following \l{Qt Quick Controls 2} types + to inform users about the progress of the application or to gather input + from the user: + + \list + \li \l [QtQuickControls2]{BusyIndicator}{Busy Indicator} indicates + activity while content is being loaded. + \li \l [QtQuickControls2]{Button} provides a push button that you can + associate with an action. + \li \l [QtQuickControls2]{CheckBox}{Check Box} provides an option button + that can be toggled on (checked) or off (unchecked). + \li \l [QtQuickControls2]{CheckDelegate}{Check Delegate} presents an + item delegate that can be toggled on (checked) or off (unchecked). + \li \l [QtQuickControls2]{ComboBox}{Combo Box} is a combined button and + popup list that is populated by using a data model. + \li \l [QtQuickControls2]{Dial} is a circular dial that is rotated to + set a value. + \li \l [QtQuickControls2]{ItemDelegate}{Item Delegate} is a standard + view item that can be used in various views and controls. + \li \l [QtQuickControls2]{ProgressBar}{Progress Bar} indicates the + progress of an operation. + \li \l [QtQuickControls2]{RadioButton}{Radio Button} provides an option + button that can be switched on (checked) or off (unchecked). + \li \l [QtQuickControls2]{RadioDelegate}{Radio Delegate} presents an + item delegate that can be toggled on (checked) or off (unchecked). + \li \l [QtQuickControls2]{Slider} selects a value by sliding a handle + along a track. + \li \l [QtQuickControls2]{SpinBox}{Spin Box} enables the user to specify + a value by clicking the up or down buttons, by pressing up or down + on the keyboard, or by entering a value in the box. + \li \l [QtQuickControls2]{Switch} is an option button that can be + toggled on or off. + \li \l [QtQuickControls2]{TextArea}{Text Area} displays multiple lines + of editable formatted text. + \li \l [QtQuickControls2]{TextField}{Text Field} displays a single line + of editable plain text. + \li \l [QtQuickControls2]{ToolBar}{Tool Bar} is a container of + application-wide and context sensitive actions and controls, such as + navigation buttons and search fields. + \li \l [QtQuickControls2]{ToolButton}{Tool Button} is a button + that is functionally similar to \uicontrol Button, but provides a + look that is more suitable for a \uicontrol {Tool Bar}. + \li \l [QtQuickControls2]{Tumbler} is a spinnable wheel of items that + can be selected. \endlist - \section1 Using Qt Quick Controls + \section1 History of Qt Quick Controls In Qt 4, ready-made Qt Quick 1 Components were provided for creating screens with a native look and feel for a particular target platform. diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc index aa25551bf9..92a526b2e7 100644 --- a/doc/src/qtquick/qtquick-connection-editor.qdoc +++ b/doc/src/qtquick/qtquick-connection-editor.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -24,7 +24,7 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage qmldesigner-pathview-editor.html \page qmldesigner-connections.html \nextpage quick-signals.html diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index db6397fa16..0727ba1d17 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-visual-editor.html \page quick-projects.html \nextpage creator-quick-ui-forms.html diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 753f02a538..cedbea745f 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,10 +30,10 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-quick-ui-forms.html \page creator-using-qt-quick-designer.html - \nextpage qmldesigner-pathview-editor.html + \nextpage quick-components.html \title Editing QML Files in Design Mode @@ -65,14 +65,17 @@ \li \uicontrol {Library} (2) displays the building blocks that you can use to design applications: predefined QML types, your own QML components, or Qt Quick Controls 2 that you import to the - project, and other resources. + project, and other resources. For more information, see + \l {Creating Components}. \li \uicontrol {Navigator} (3) displays the items in the current QML - file as a tree structure. + file as a tree structure. For more information, see + \l {Managing Item Hierarchy}. \li \uicontrol {Properties} (4) organizes the properties of the selected item. You can change the properties also in the - \uicontrol {Text Editor}. + \uicontrol {Text Editor}. For more information, see + \l {Specifying Item Properties}. \li \uicontrol Connections (5) enables you to create connections between objects, signals, and object properties. For more @@ -97,341 +100,10 @@ \endlist - \section1 Managing Item Hierarchy - - The \uicontrol Navigator displays the items in the current QML file and their - relationships. - Items (1) are listed in a tree structure, below their parent (2). - - \image qmldesigner-navigator.png "Navigator" - - You can select items in the \uicontrol Navigator to edit their properties - in the \uicontrol Properties pane. Items can access the properties of their - parent item. To select items on the canvas, right-click an item, - and select another type in the context menu. - - Typically, child items are located within the parent item on the - canvas. However, they do not necessarily have to fit inside the parent - item. For example, you might want to make a mouse area larger than the - rectangle or image beneath it (1). - - \image qmldesigner-element-size.png "Mouse area for a button" - - When you copy an item, all its child items are also copied. When - you remove an item, the child items are also removed. - - You can show and hide items on the canvas to focus on specific parts of the - application. Click the \inlineimage icon_color_none.png - (\uicontrol Transparent) button to change the visibility of an item on the - canvas. To change the - visibility of an item in the application, select the \uicontrol Visibility - check box in the \uicontrol Properties pane or select \uicontrol Edit > - \uicontrol Visibility in the context menu. - - You can also set the \uicontrol Opacity field to 0 to hide items that you - want to apply animation to. - - As all properties, visibility and opacity are inherited from the parent - item. To hide or show child items, edit the properties of the parent item. - - To hide invisible items in the navigator, click \inlineimage filtericon.png - (\uicontrol {Filter Tree}) and select \uicontrol {Show only visible items}. - - To reset item size, position, or anchors, select context menu commands. To - change the source of an Image type, select \uicontrol {Change Source URL} in - the context menu. - - To view lists of files or projects, instead, select \uicontrol {File System}, - \uicontrol {Open Documents}, or \uicontrol Projects in the menu. - To view several types of content at a time, split the sidebars by clicking - the \inlineimage splitbutton_horizontal.png - (\uicontrol Split) button. - - \section2 Setting the Stacking Order - - The \c z property of an \l Item determines its position in relation to its - sibling items in the - type hierarchy. By default, items with a higher stacking value are - drawn on top of siblings with a lower stacking value. Items with the same - stacking value are drawn in the order they are listed, from the last item - up. - - To raise or lower the stack value of an item, select \inlineimage raise.png - (\uicontrol Raise) or \inlineimage lower.png - (\uicontrol Lower) on the toolbar. - - To move an item to the front or back of all its siblings, right-click it in - the navigator or the \uicontrol {Form Editor} and select - \uicontrol {Stack (z)}. To remove the \c z property, select - \uicontrol {Reset z Property}. - - You can also use a \uicontrol StackLayout item (Qt Quick Controls 2) to - create a stacked view. For more information, see \l {Using Layouts}. - - \section2 Switching Parent Items - - When you drag and drop instances of QML types to the canvas, the new item - is added as a child of the item beneath it. When you move items on the - canvas, it is not possible to determine - whether you want to adjust their position or attach them to a new - parent item. Therefore, the parent item is not automatically - changed. To change the parent of the item, press down the \key Shift - key before you drag and drop the item into a new position. The topmost - item under the cursor becomes the new parent of the item. - - You can change the parent of an item also in the \uicontrol Navigator. - Drag and drop the item to another position in the tree or use the arrow - buttons (1) to move the item in the tree. - - \image qmldesigner-navigator-arrows.png "Navigator arrow buttons" - - \section1 QML Type Library - - The \uicontrol {Library} enables you to select QML types, UI components, and - resources, as well as to manage imports. - - \uicontrol {QML Types} displays the QML types grouped by category: your own QML - components, basic types, layouts, positioner types, and views. - - Sets of UI components with the look and feel of a particular mobile device - platform have been defined for Qt Quick 1. Since Qt 5.1, ready-made Qt - Quick Controls, Dialogs, and Layouts are available for creating user - interfaces using Qt Quick 2.1. The components and controls are based on - standard QML types. To view the components and controls in the - \uicontrol {Library}, import the component sets in \uicontrol Imports. - - The \uicontrol {Qt Quick Application} wizards for a particular platform add the - import statements automatically. You can remove import statements in - \uicontrol Imports - - \image qmldesigner-qml-components.png "QML Components" - - \uicontrol {Resources} displays the images and other files that you copy - to the project folder (to the same subfolder as the QML files). - - \section1 Specifying Item Properties - - The \uicontrol Properties pane displays all the properties of the selected item. - The properties are grouped by type. The top part of the pane - displays properties that are common to all QML types, such as - position, size, and visibility. - - The bottom part of the pane displays properties that are specific to each - QML type. For example, the following image displays the properties you - can set for \uicontrol Rectangle (1) and \uicontrol Text (2) items. - - \image qmldesigner-element-properties.png - - To change the item type, double-click the \uicontrol Type field in the - \uicontrol Properties pane, and enter the name of another QML type in the - field. If you have specified properties for the item that are not supported - for the new type, the type cannot be changed and an error message is - displayed. Remove the properties in the \uicontrol {Text Editor} and try - again. - - To return an item to its implicit position after moving it, select the - \inlineimage qtcreator-reset-position-icon.png - (\uicontrol {Reset Position}) button on the toolbar. To return it to its - implicit size, select \inlineimage qtcreator-reset-size-icon.png - (\uicontrol {Reset Size}) button. - - To set the visibility of the item, select \uicontrol {Edit > Visibility} in the context menu. - - To specify the color of the selected item in the \uicontrol {Select Color} - dialog, select \uicontrol {Edit Color} in the context menu. - - For more information on the properties available for an item, press - \key {F1}. - - \section2 Viewing Changes in Properties - - The default values of properties are displayed in white color, while the - values that you specify explicitly are highlighted with blue color. In - addition, property changes in states are highlighted with blue. - - This allows you to easily see which values are set in the UI form or - QML file and - which values are default characteristics of a QML type or a component. - - When editing states, you can easily see which values are explicitly set in - the current state and which values are derived from the base state. - - The following images illustrate this. In the base state, the \uicontrol Size (1) - and \uicontrol Colors (2) values are explicitly set and highlighted. - - \image qmldesigner-properties-explicit-base.png "Explicitly set properties" - - In \uicontrol State1, only the color (1) is explicitly set and highlighted. - - \image qmldesigner-properties-explicit-state1.png "Explicitly set properties" - - Resetting a property sets it back to the default value and removes the value - from the UI form or QML file. - - \note As a result, all boolean values can be visualized in four different - ways. - - For example, visibility can be visualized as follows: - - \table - \row - \li \image qmldesigner-boolean-true.png - \li TRUE - \li The QML type is visible by default. The visibility might be - overridden by the visibility set in the base state. - \row - \li \image qmldesigner-boolean-true-blue.png - \li TRUE (highlighted) - \li The QML type is explicitly set to visible. - \row - \li \image qmldesigner-boolean-false.png - \li FALSE - \li The QML type is hidden by default. The visibility might be - overridden by the visibility set in the base state. - \row - \li \image qmldesigner-boolean-false-blue.png - \li FALSE (hightlighted) - \li The type is explicitly set to hidden. - \endtable - - \section2 Marking Text Items for Translation - - To support translators, mark each text item that should be translated. - In the \uicontrol Properties pane, \uicontrol Text field, select \uicontrol tr (1). - - \image qmldesigner-text-property-tr.png "Text properties" - - By default, the text string is enclosed in a \c qsTr() call. - - \image qml-translate.png "Text marked for translation" - - If you use text IDs instead of plain text, change the default call to - \c qsTrId(). Select \uicontrol Tools > \uicontrol Options > - \uicontrol {Qt Quick} > \uicontrol {\QMLD}, and then select the - \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization - group. For more information about text ID based translations, see - \l {Qt Linguist Manual: Text ID Based Translations}. - - To preserve the context when editing the text or to change the context - by setting a binding on the text property, change the default call to - \c qsTranslate() by selecting the \uicontrol {qsTranslate()} radio button. - - For more information, see - \l {Internationalization and Localization with Qt Quick}. - - \section2 Loading Placeholder Data - - The Design mode supports views, models, and delegates, so that when you add - a Grid View, List View, or Path View item, the ListModel and the delegate - item are added automatically. - - However, the missing context of the application presents a challenge. - Specific models defined in C++ are the most obvious case. Often, - the context is missing simple properties, which are either defined in C++, - or in other QML files. A typical example is an item that uses the - properties of its parent, such as \c parent.width. - - \section3 Using Dummy Models - - If you open a file in the Design mode that references a C++ model, you see - nothing on - the canvas. If the data in the model is fetched from the internet, you have - no control over it. To get reliable data, \e {dummy data} was introduced. - - For example, the following code snippet describes the file example.qml that - contains a ListView that in turn specifies a C++ model: - - \qml - ListView { - model: dataModel - delegate: ContactDelegate { - name: name - } - } - \endqml - - Create a directory named \e dummydata in the root directory of the project, - so that it is not deployed to the device. In the \c dummydata directory, - create a QML file that has the same name as the value of \c model: - - \code - qml/exampleapp/example.qml - dummydata/dataModel.qml - \endcode - - Then create the dataModel.qml file that contains the dummy data: - - \qml - import QtQuick 1.0 - - ListModel { - ListElement { - name: "Ariane" - } - ListElement { - name: "Bella" - } - ListElement { - name: "Corinna" - } - } - \endqml - - \section3 Creating Dummy Context - - The following example presents a common pattern in QML: - - \qml - Item { - width: parent.width - height: parent.height - } - \endqml - - This works nicely for applications but the Design mode displays a zero-sized - item. A parent for the opened file does not exist, because the context is - missing. To get around the missing context, the idea of a \e {dummy - context} is introduced. If you place a file with the same name as the - application (here, example.qml) in the \c {dummydata/context} directory, - you can fake a parent context: - - \qml - import QtQuick 1.0 - import QmlDesigner 1.0 - - DummyContextObject { - parent: Item { - width: 640 - height: 300 - } - } - \endqml - - \section2 Building Transformations on Items - - The \uicontrol Advanced pane allows you to configure advanced transformations, - such as rotation, scale, and translation. You can assign any number of - transformations to an item. Each transformation is applied in order, one at - a time. - - For more information on Transform types, see \l{Transform}. - - \section2 Editing Properties Inline - - You can double-click objects on the canvas to edit their text, color, or - source properties inline. - Because you can specify several of these properties for some QML types, such - as \l [QML]{TextEdit}{Text Edit}, you can also right-click objects to open - the inline editors from a context-menu. - - \image qmldesigner-inline-editing.png - - \section1 Working with QML Types on Canvas + \section1 Snapping to Parent and Sibling Items You design applications on the canvas by placing items on it. - \section2 Snapping to Parent and Sibling Items - When you are working on a design, you can use snapping to align items on the canvas. Click the \inlineimage snapping.png button to have the items snap to their parent or sibling items. Snapping @@ -451,13 +123,13 @@ \image qmldesigner-snap-margins.png "Snapping lines on canvas" - \section2 Hiding Item Boundaries + \section1 Hiding Item Boundaries The Design mode displays the boundaries of items on the canvas. To hide the boundaries, click the \inlineimage boundingrect.png button. - \section2 Selecting Items + \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 @@ -467,7 +139,7 @@ \inlineimage qmldesigner-only-select-items-with-content.png button. - \section2 Previewing Component Size + \section1 Previewing Component Size The width and height of the root item in a QML file determine the size of the component. You can reuse components, such as buttons, in different @@ -485,13 +157,13 @@ \image qmldesigner-preview-size.png "Canvas width and height" - \section2 Specifying Canvas Size + \section1 Specifying Canvas Size To change the canvas size, select \uicontrol Tools > \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} and specify the canvas width and height in the \uicontrol Canvas group. - \section2 Refreshing the Canvas + \section1 Refreshing the Canvas When you open QML files in the Design mode, the items in the file are drawn on the canvas. When you edit the item properties, the QML file and diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc index c4ecf06c01..fe48d2bc8b 100644 --- a/doc/src/qtquick/qtquick-exporting-qml.qdoc +++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage qtquick-iso-icon-browser.html \page quick-export-to-qml.html \nextpage creator-qml-modules-with-plugins.html diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc index e8f918ca26..c4ea2de21d 100644 --- a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc +++ b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -24,8 +24,8 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} - \previouspage quick-screens.html + \contentspage index.html + \previouspage quick-states.html \page qtquick-iso-icon-browser.html \nextpage quick-export-to-qml.html diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc index b3b70c0013..9e2c68204f 100644 --- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc +++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage quick-export-to-qml.html \page creator-qml-modules-with-plugins.html \nextpage creator-using-qt-designer.html diff --git a/doc/src/qtquick/qtquick-navigator.qdoc b/doc/src/qtquick/qtquick-navigator.qdoc new file mode 100644 index 0000000000..1b4f211ff5 --- /dev/null +++ b/doc/src/qtquick/qtquick-navigator.qdoc @@ -0,0 +1,116 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator 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. +** +****************************************************************************/ + +/*! + \contentspage {Qt Creator Manual} + \previouspage quick-scalable-image.html + \page qtquick-navigator.html + \nextpage qtquick-properties.html + + \title Managing Item Hierarchy + + The \uicontrol Navigator displays the items in the current QML file and + their relationships. Items (1) are listed in a tree structure, below their + parent (2). + + \image qmldesigner-navigator.png "Navigator" + + You can select items in the \uicontrol Navigator to edit their properties + in the \uicontrol Properties pane. Items can access the properties of their + parent item. To select items on the canvas, right-click an item, and select + another type in the context menu. + + Typically, child items are located within the parent item on the canvas. + However, they do not necessarily have to fit inside the parent item. For + example, you might want to make a mouse area larger than the rectangle + or image beneath it (1). + + \image qmldesigner-element-size.png "Mouse area for a button" + + When you copy an item, all its child items are also copied. When + you remove an item, the child items are also removed. + + You can show and hide items on the canvas to focus on specific parts of the + application. Click the \inlineimage icon_color_none.png + (\uicontrol Transparent) button to change the visibility of an item on the + canvas. To change the visibility of an item in the application, select the + \uicontrol Visibility check box in the \uicontrol Properties pane or select + \uicontrol Edit > \uicontrol Visibility in the context menu. + + You can also set the \uicontrol Opacity field to 0 to hide items that you + want to apply animation to. + + As all properties, visibility and opacity are inherited from the parent + item. To hide or show child items, edit the properties of the parent item. + + To hide invisible items in the navigator, click \inlineimage filtericon.png + (\uicontrol {Filter Tree}) and select \uicontrol {Show only visible items}. + + To reset item size, position, or anchors, select context menu commands. To + change the source of an Image type, select \uicontrol {Change Source URL} in + the context menu. + + To view lists of files or projects, instead, select \uicontrol {File System}, + \uicontrol {Open Documents}, or \uicontrol Projects in the menu. To view + several types of content at a time, split the sidebars by clicking the + \inlineimage splitbutton_horizontal.png + (\uicontrol Split) button. + + \section1 Setting the Stacking Order + + The \c z property of an \l Item determines its position in relation to its + sibling items in the type hierarchy. By default, items with a higher + stacking value are drawn on top of siblings with a lower stacking value. + Items with the same stacking value are drawn in the order they are listed, + from the last item up. + + To raise or lower the stack value of an item, select \inlineimage raise.png + (\uicontrol Raise) or \inlineimage lower.png + (\uicontrol Lower) on the toolbar. + + To move an item to the front or back of all its siblings, right-click it in + the navigator or the \uicontrol {Form Editor} and select + \uicontrol {Stack (z)}. To remove the \c z property, select + \uicontrol {Reset z Property}. + + You can also use a \uicontrol StackLayout item (Qt Quick Controls 2) to + create a stacked view. For more information, see \l {Using Layouts}. + + \section1 Switching Parent Items + + When you drag and drop instances of QML types to the canvas, the new item is + added as a child of the item beneath it. When you move items on the canvas, + it is not possible to determine whether you want to adjust their position or + attach them to a new parent item. Therefore, the parent item is not + automatically changed. To change the parent of the item, press down the + \key Shift key before you drag and drop the item into a new position. The + topmost item under the cursor becomes the new parent of the item. + + You can change the parent of an item also in the \uicontrol Navigator. + Drag and drop the item to another position in the tree or use the arrow + buttons (1) to move the item in the tree. + + \image qmldesigner-navigator-arrows.png "Navigator arrow buttons" +*/ diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc index 59fe8c51ca..9ac6ffba6c 100644 --- a/doc/src/qtquick/qtquick-pathview-editor.qdoc +++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -24,8 +24,8 @@ ****************************************************************************/ /*! - \contentspage {Qt Creator Manual} - \previouspage creator-using-qt-quick-designer.html + \contentspage index.html + \previouspage qtquick-properties.html \page qmldesigner-pathview-editor.html \nextpage qmldesigner-connections.html diff --git a/doc/src/qtquick/qtquick-properties.qdoc b/doc/src/qtquick/qtquick-properties.qdoc new file mode 100644 index 0000000000..95b5e41f12 --- /dev/null +++ b/doc/src/qtquick/qtquick-properties.qdoc @@ -0,0 +1,250 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator 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. +** +****************************************************************************/ + +/*! + \contentspage {Qt Creator Manual} + \previouspage qtquick-navigator.html + \page qtquick-properties.html + \nextpage qmldesigner-pathview-editor.html + + \title Specifying Item Properties + + The \uicontrol Properties pane displays all the properties of the selected + item. The properties are grouped by type. The top part of the pane displays + properties that are common to all QML types, such as position, size, and + visibility. + + The bottom part of the pane displays properties that are specific to each + QML type. For example, the following image displays the properties you can + set for \uicontrol Rectangle (1) and \uicontrol Text (2) items. + + \image qmldesigner-element-properties.png + + To change the item type, double-click the \uicontrol Type field in the + \uicontrol Properties pane, and enter the name of another QML type in the + field. If you have specified properties for the item that are not supported + for the new type, the type cannot be changed and an error message is + displayed. Select the \uicontrol Nut menu next to the property name, and + then select \uicontrol Reset to remove the property values before trying + again. + + To return an item to its implicit position after moving it, select the + \inlineimage qtcreator-reset-position-icon.png + (\uicontrol {Reset Position}) button on the toolbar. To return it to its + implicit size, select \inlineimage qtcreator-reset-size-icon.png + (\uicontrol {Reset Size}) button. + + To set the visibility of the item, select \uicontrol Edit > + \uicontrol Visibility in the context menu. + + To specify the color of the selected item in the \uicontrol {Select Color} + dialog, select \uicontrol {Edit Color} in the context menu. + + For more information on the properties available for an item, press + \key {F1}. + + \section1 Viewing Changes in Properties + + The default values of properties are displayed in white color, while the + values that you specify explicitly are highlighted with blue color. In + addition, property changes in states are highlighted with blue. + + This allows you to easily see which values are set in the UI form or QML + file and which values are default characteristics of a QML type or a + component. + + When editing states, you can easily see which values are explicitly set in + the current state and which values are derived from the base state. + + The following images illustrate this. In the base state, the \uicontrol Size + (1) and \uicontrol Colors (2) values are explicitly set and highlighted. + + \image qmldesigner-properties-explicit-base.png "Explicitly set properties" + + In \uicontrol State1, only the color (1) is explicitly set and highlighted. + + \image qmldesigner-properties-explicit-state1.png "Explicitly set properties" + + Resetting a property sets it back to the default value and removes the value + from the UI form or QML file. + + \note As a result, all boolean values can be visualized in four different + ways. + + For example, visibility can be visualized as follows: + + \table + \row + \li \image qmldesigner-boolean-true.png + \li TRUE + \li The QML type is visible by default. The visibility might be + overridden by the visibility set in the base state. + \row + \li \image qmldesigner-boolean-true-blue.png + \li TRUE (highlighted) + \li The QML type is explicitly set to visible. + \row + \li \image qmldesigner-boolean-false.png + \li FALSE + \li The QML type is hidden by default. The visibility might be + overridden by the visibility set in the base state. + \row + \li \image qmldesigner-boolean-false-blue.png + \li FALSE (hightlighted) + \li The type is explicitly set to hidden. + \endtable + + \section1 Marking Text Items for Translation + + To support translators, mark each text item that should be translated. + In the \uicontrol Properties pane, \uicontrol Text field, select \uicontrol tr (1). + + \image qmldesigner-text-property-tr.png "Text properties" + + By default, the text string is enclosed in a \c qsTr() call. + + \image qml-translate.png "Text marked for translation" + + If you use text IDs instead of plain text, change the default call to + \c qsTrId(). Select \uicontrol Tools > \uicontrol Options > + \uicontrol {Qt Quick} > \uicontrol {\QMLD}, and then select the + \uicontrol {qsTrId()} radio button in the \uicontrol Internationalization + group. For more information about text ID based translations, see + \l {Qt Linguist Manual: Text ID Based Translations}. + + To preserve the context when editing the text or to change the context + by setting a binding on the text property, change the default call to + \c qsTranslate() by selecting the \uicontrol {qsTranslate()} radio button. + + For more information, see + \l {Internationalization and Localization with Qt Quick}. + + \section1 Loading Placeholder Data + + The Design mode supports views, models, and delegates, so that when you add + a Grid View, List View, or Path View item, the ListModel and the delegate + item are added automatically. + + However, the missing context of the application presents a challenge. + Specific models defined in C++ are the most obvious case. Often, + the context is missing simple properties, which are either defined in C++, + or in other QML files. A typical example is an item that uses the + properties of its parent, such as \c parent.width. + + \section2 Using Dummy Models + + If you open a file in the Design mode that references a C++ model, you see + nothing on + the canvas. If the data in the model is fetched from the internet, you have + no control over it. To get reliable data, \e {dummy data} was introduced. + + For example, the following code snippet describes the file example.qml that + contains a ListView that in turn specifies a C++ model: + + \qml + ListView { + model: dataModel + delegate: ContactDelegate { + name: name + } + } + \endqml + + Create a directory named \e dummydata in the root directory of the project, + so that it is not deployed to the device. In the \c dummydata directory, + create a QML file that has the same name as the value of \c model: + + \code + qml/exampleapp/example.qml + dummydata/dataModel.qml + \endcode + + Then create the dataModel.qml file that contains the dummy data: + + \qml + import QtQuick 1.0 + + ListModel { + ListElement { + name: "Ariane" + } + ListElement { + name: "Bella" + } + ListElement { + name: "Corinna" + } + } + \endqml + + \section2 Creating Dummy Context + + The following example presents a common pattern in QML: + + \qml + Item { + width: parent.width + height: parent.height + } + \endqml + + This works nicely for applications but the Design mode displays a zero-sized + item. A parent for the opened file does not exist, because the context is + missing. To get around the missing context, the idea of a \e {dummy + context} is introduced. If you place a file with the same name as the + application (here, example.qml) in the \c {dummydata/context} directory, + you can fake a parent context: + + \qml + import QtQuick 1.0 + import QmlDesigner 1.0 + + DummyContextObject { + parent: Item { + width: 640 + height: 300 + } + } + \endqml + + \section1 Building Transformations on Items + + The \uicontrol Advanced pane allows you to configure advanced + transformations, such as rotation, scale, and translation. You + can assign any number of transformations to an item. Each + transformation is applied in order, one at a time. + + For more information on Transform types, see \l{Transform}. + + \section1 Editing Properties Inline + + You can double-click objects on the canvas to edit their text, color, + or source properties inline. Because you can specify several of these + properties for some QML types, such as \l [QML]{TextEdit}{Text Edit}, + you can also right-click objects to open the inline editors from a + context-menu. + + \image qmldesigner-inline-editing.png +*/ diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc deleted file mode 100644 index fd035049ca..0000000000 --- a/doc/src/qtquick/qtquick-screens.qdoc +++ /dev/null @@ -1,515 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Creator 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. -** -****************************************************************************/ - -// ********************************************************************** -// NOTE: the sections are not ordered by their logical order to avoid -// reshuffling the file each time the index order changes (i.e., often). -// Run the fixnavi.pl script to adjust the links to the index order. -// ********************************************************************** - -/*! - - \contentspage {Qt Creator Manual} - \previouspage quick-scalable-image.html - \page quick-screens.html - \nextpage qtquick-iso-icon-browser.html - - \title Creating Screens - - You can use predefined QML types and your own components to create - screens. Typically, the main QML file in a Qt Quick project specifies the - main window of an application. - - The QML files in the project folder are displayed in \uicontrol {QML Components} - in the \uicontrol Library. - - \section1 Adding Components to Screens - - \list 1 - - \li Drag and drop components from the \uicontrol Library to the - \uicontrol Navigator or \uicontrol {Form Editor}. - - \li Select components in the \uicontrol Navigator to edit their - properties in the \uicontrol Properties pane. - - For example, you can anchor components to a position on the screen. - - \endlist - - For more information about the ready-made components available, see - \l {Using Qt Quick Controls}. - - \section1 Using Data Models - - You can create the following types of views to organize items provided by - \l{Models and Views in Qt Quick}{data models}: - - \list - - \li \l{GridView}{Grid View} provides a grid vizualization of a model. - - \li \l{ListView}{List View} provides a list vizualization of a model. - - \li \l{PathView}{Path View} visualizes the contents of a model along a - path. - - \endlist - - When you add a \l{GridView}{Grid View}, \l{ListView}{List View}, or - \l{PathView}{Path View}, the ListModel and the delegate component that - creates an instance for each item in the model are added automatically. - You can edit item properties in the \uicontrol Properties pane or - in the \uicontrol {Text Editor}. You can also replace the default model and - delegate with other, more complex models and delegates in the - \uicontrol {Text Editor}. - - \section1 Positioning Items on Screens - - The position of an item on the canvas can be either absolute or relative - to other items. If you are designing a static user interface, - \l{Important Concepts In Qt Quick - Positioning#manual-positioning} - {manual positioning} provides the most efficient form of positioning items - on the screen. For a dynamic user interface, you can employ the following - positioning methods provided by Qt Quick: - - \list - - \li \l{Setting Bindings} - - \li \l{Setting Anchors and Margins} - - \li \l{Using Positioners} - - \li \l{Using Layouts} - - \li \l{Organizing Items} - - \endlist - - \section2 Setting Bindings - - \l{Positioning with Bindings} - {Property binding} is a declarative way of specifying the value of a property. - Binding allows a property value to be expressed as a JavaScript expression - that defines the value relative to other property values or data accessible - in the application. The property value is automatically kept up to date if - the other properties or data values change. - - Property bindings are created implicitly in QML whenever a property is - assigned a JavaScript expression. To set JavaScript expressions as values of - properties in the Design mode, click the circle icon next to a property to - open a context menu, and select \uicontrol {Set Binding}. - - \image qmldesigner-set-expression.png "Type properties context menu" - - The \uicontrol {Binding Editor} supports code completion. Start typing a - string and press \key Ctrl+Space to display a list of properties, IDs, and - code snippets. When you enter a period (.) after a property name, a list of - available values is displayed. Press \key Enter to accept the first - suggestion in the list and to complete the code. - - \image qmldesigner-binding-editor.png "Binding Editor" - - To remove bindings, select \uicontrol Reset in the context menu. - - You can set bindings also in the \uicontrol Connections view. For more - information, see \l {Adding Bindings Between Properties}. - - For more information on the JavaScript environment provided by QML, see - \l{Integrating QML and JavaScript}. - - Bindings are a black box for the Design mode and using them might have a - negative impact on - performance, so consider setting anchors and margins for items, instead. - For example, instead of setting \c {parent.width} for an item, you could - anchor the item to its sibling items on the left and the right. - - \section2 Setting Anchors and Margins - - In an \l{Important Concepts In Qt Quick - Positioning#anchors} - {anchor-based} layout, each QML type can be thought of as having a set of - invisible \e anchor lines: top, bottom, left, right, fill, horizontal - center, vertical center, and baseline. - - In the \uicontrol Layout pane you can set anchors and margins for items. To set - the anchors of an item, click the anchor buttons. You can combine the - top/bottom, left/right, and horizontal/vertical anchors to anchor items in - the corners of the parent item or center them horizontally or vertically - within the parent item. - - \image qmldesigner-anchor-buttons.png "Anchor buttons" - - For convenience, you can click the \inlineimage anchor_fill.png - (\uicontrol {Fill to Parent}) toolbar button to apply fill anchors to an - item and the \inlineimage qtcreator-anchors-reset-icon.png - (\uicontrol {Reset Anchors}) button to reset the anchors to their saved - state. - - You can specify the baseline anchor in the \uicontrol {Text Editor} in the - Design mode. - - For performance reasons, you can only anchor an item to its siblings and - direct parent. By default, an item is anchored to its parent when you - use the anchor buttons. Select a sibling of the item in the \uicontrol Target - field to anchor to it, instead. - - Arbitrary anchoring is not supported. For example, you cannot specify: - \c {anchor.left: parent.right}. You have to specify: \c {anchor.left: parent.left}. - When you use the anchor buttons, anchors to the parent item are always - specified to the same side. However, anchors to sibling items are specified - to the opposite side: \c {anchor.left: sibling.right}. This allows you to keep - sibling items together. - - In the following image, \uicontrol{Rectangle 2} is anchored to \uicontrol{Rectangle 1} - on its left and to the bottom of its parent. - - \image qmldesigner-anchors.png "Anchoring sibling items" - - The anchors for \uicontrol{Rectangle 2} are specified as follows in code: - - \qml - Rectangle { - id: rectangle2 - anchors.left: rectangle1.right - anchors.leftMargin: 15 - anchors.bottom: parent.bottom - anchors.bottomMargin: 15 - // - } - \endqml - - Margins specify the amount of empty space to leave to the outside of an item. - Margins only have meaning for anchors. They do not take any effect when using - other layouts or absolute positioning. - - \section2 Using Positioners - - \l{Important Concepts In Qt Quick - Positioning#positioners} - {Positioner items} are container items that manage the positions of items in - a declarative user interface. Positioners behave in a similar way to the - layout managers used with standard Qt widgets, except that they are also - containers in their own right. - - You can use the following positioners to arrange items on screens: - - \list - - \li \l[QML] {Column} arranges its child items vertically. - - \li \l[QML] {Row} arranges its child items horizontally. - - \li \l[QML] {Grid} - arranges its child items so that they are aligned in a grid and - are not overlapping. - - \li \l[QML] {Flow} - arranges its child items side by side, wrapping as necessary. - - \endlist - - To lay out several items in a \uicontrol Column, \uicontrol Row, - \uicontrol Grid, or \uicontrol Flow, select the items on the canvas, and - then select \uicontrol Layout in the context menu. - - \section2 Using Layouts - - From Qt 5.1, you can use QML types in the \l{qtquicklayouts-index.html} - {Qt Quick Layouts} module to arrange Qt Quick items on screens. Unlike - positioners, they manage both the positions and sizes of items in a - declarative interface. They are well suited for resizable user interfaces. - - You can use the following layout types to arrange items on screens: - - \list - - \li \l{Layout} provides attached properties for items pushed onto a - \uicontrol {Column Layout}, \uicontrol {Row Layout}, or \uicontrol {Grid Layout}. - - \li \l{ColumnLayout}{Column Layout} provides a grid layout with only one - column. - - \li \l{RowLayout}{Row Layout} provides a grid layout with only one row. - - \li \l{GridLayout}{Grid Layout} provides a way of dynamically arranging - items in a grid. - - \li \l{StackLayout}{Stack Layout} provides a stack of items where only - one item is visible at a time. - - \endlist - - To lay out several items in a \uicontrol {Column Layout}, \uicontrol {Row Layout}, - \uicontrol {Grid Layout}, or \uicontrol {Stack Layout}, select the items in - the \uicontrol {Form Editor}, and then select \uicontrol Layout in the - context menu. - - You can also click the \inlineimage column.png - (\uicontrol {Column Layout}), \inlineimage row.png - (\uicontrol {Row Layout}), and \inlineimage grid.png - (\uicontrol {Grid Layout}) toolbar buttons to apply layouts to the selected - items. - - To make an item within a layout as wide as possible while respecting the - given constraints, select the item on the canvas and then select - \uicontrol Layout > \uicontrol {Fill Width} in the context menu. To make the item as - high as possible, select \uicontrol {Fill Height}. - - \section3 Editing Stack Layouts - - \image qtquick-designer-stacked-view.png - - To add items to a \uicontrol {Stack Layout}, select the - \inlineimage plus.png - button next to the type name in the \uicontrol {Form Editor}. To move - between items, select the \inlineimage prev.png - (\uicontrol Previous) and \inlineimage next.png - (\uicontrol Next) buttons. - - To add a tab bar to a stack layout, select \uicontrol {Stacked Container} > - \uicontrol {Add Tab Bar}. - - To raise or lower the stacking order of an item, select - \uicontrol {Stacked Container} > \uicontrol {Increase Index} or - \uicontrol {Decrease Index}. - - \section2 Organizing Items - - From Qt 5.7, you can use the following \l{Qt Quick Controls 2} types to - organize items on screens: - - \list - - \li \l [QtQuickControls2]{Frame} places a logical group of controls - within a visual frame. - - \li \l [QtQuickControls2]{GroupBox}{Group Box} is used to lay out a - logical group of controls together, within a titled visual frame. - - \li \l [QtQuickControls2]{Label} is a text label with inherited styling - and font. - - \li \l [QtQuickControls2]{PageIndicator}{Page Indicator} indicates the - currently active page. - - \li \l [QtQuickControls2]{Pane} provides a background matching with the - application style and theme. - - \endlist - - \section1 Using States - - Use states and transitions to navigate between screens. - - QML states typically describe user interface configurations, such as the UI - controls, their properties and behavior and the available actions. For - example, you can use states to create two screens. - - To add states, click the empty slot in the \uicontrol States pane. Then modify the - new state in the \uicontrol {Form Editor} or the \uicontrol Properties pane. - - \image qmldesigner-states.png "States pane" - - The properties that you change in a state are highlighted with blue color. - In the \uicontrol {Text Editor}, you can see the changes recorded as changes - to the base state. - - To keep the QML code clean, you should create a base state that contains all - the types you will need in the application. You can then create states, - in which you hide and show a set of items and modify their properties. - This allows you to: - - \list - - \li Align items on different screens with each other. - - \li Avoid excessive property changes. If an item is invisible in the - base state, you must define all changes to its child types as - property changes, which leads to complicated QML code. - - \li Minimize the differences between the base state and the other states - to keep the QML code short and readable and to improve performance. - - \li Avoid problems when using transitions and animation when changing - states. - - \endlist - - To create screens for an application by using states: - - \list 1 - - \li In the base state, add all items you will need in the - application (1). - While you work on one screen, you can click the - \inlineimage eye_open.png - icon to hide items on the canvas that are not part of a screen. - - \li In the \uicontrol States pane, click the empty slot to create a new state - and give it a name. For example, \c Normal. - - \li In the \uicontrol Properties pane (2), deselect the \uicontrol Visibility check box - or set \uicontrol Opacity to 0 for each item that is not needed in this - view. If you specify the setting for the parent item, all child - items inherit it and are also hidden. - - \image qmldesigner-screen-design.png "Designing screens" - - \li Create additional states for each screen and set the visibility - or opacity of the items in the screen. - - \li To determine which view opens when the application starts, use the - \uicontrol {Text Editor} to set the state of the root item of the - .qml file, as specified by the following code snippet: - - \qml - Item { - state: "Normal" - } - \endqml - - \endlist - - \section2 Using SCXML State Machines - - To use QML together with an SCXML state machine, add states and bind them to - the state machine in the \uicontrol Backends tab in the Design mode, as - described in \l {Managing C++ Backend Objects}. - - In the \uicontrol States pane, you can edit the \c when condition of states - to map QML states to the states of the SCXML state machine. For an example, - see \l {Qt SCXML Traffic Light QML Example (Dynamic)}. - - \image qmldesigner-states-when-condition.png - - \section1 Animating Screens - - To make movement between states smooth, you can specify transitions. You can - use different types of animated transitions. For example, you can animate - changes to property values and colors. You can use rotation animation to - control the direction of rotation. For more information, see - \l{Animation and Transitions in Qt Quick}. - - You can use the \c ParallelAnimation type to start several animations at - the same time. Or use the \c SequentialAnimation type to run them one - after another. - - You can use the \uicontrol {Text Editor} to specify transitions. For more - information, see \l{Transition}. - - \section1 Adding User Interaction Methods - - You can use the following QML types to add basic interaction methods to - screens: - - \list - - \li \l{Flickable} - items can be flicked horizontally or vertically. - - \li \l{FocusScope}{Focus Scope} - assists in keyboard focus handling when building reusable QML - components. - - \li \l [QML]{MouseArea}{Mouse Area} enables simple mouse handling. - - \endlist - - Since Qt 5.7, you can also use the following \l{Qt Quick Controls 2} types - to inform users about the progress of the application or to gather input - from the user: - - \list - - \li \l [QtQuickControls2]{BusyIndicator}{Busy Indicator} indicates - activity while content is being loaded. - - \li \l [QtQuickControls2]{Button} provides a push button that you can - associate with an action. - - \li \l [QtQuickControls2]{CheckBox}{Check Box} provides an option button - that can be toggled on (checked) or off (unchecked). - - \li \l [QtQuickControls2]{CheckDelegate}{Check Delegate} presents an - item delegate that can be toggled on (checked) or off (unchecked). - - \li \l [QtQuickControls2]{ComboBox}{Combo Box} is a combined button and - popup list that is populated by using a data model. - - \li \l [QtQuickControls2]{Dial} is a circular dial that is rotated to - set a value. - - \li \l [QtQuickControls2]{ItemDelegate}{Item Delegate} is a standard - view item that can be used in various views and controls. - - \li \l [QtQuickControls2]{ProgressBar}{Progress Bar} indicates the - progress of an operation. - - \li \l [QtQuickControls2]{RadioButton}{Radio Button} provides an option - button that can be switched on (checked) or off (unchecked). - - \li \l [QtQuickControls2]{RadioDelegate}{Radio Delegate} presents an - item delegate that can be toggled on (checked) or off (unchecked). - - \li \l [QtQuickControls2]{Slider} selects a value by sliding a handle - along a track. - - \li \l [QtQuickControls2]{SpinBox}{Spin Box} enables the user to specify - a value by clicking the up or down buttons, by pressing up or down - on the keyboard, or by entering a value in the box. - - \li \l [QtQuickControls2]{Switch} is an option button that can be - toggled on or off. - - \li \l [QtQuickControls2]{TextArea}{Text Area} displays multiple lines - of editable formatted text. - - \li \l [QtQuickControls2]{TextField}{Text Field} displays a single line - of editable plain text. - - \li \l [QtQuickControls2]{ToolBar}{Tool Bar} is a container of - application-wide and context sensitive actions and controls, such as - navigation buttons and search fields. - - \li \l [QtQuickControls2]{ToolButton}{Tool Button} is a button - that is functionally similar to \uicontrol Button, but provides a - look that is more suitable for a \uicontrol {Tool Bar}. - - \li \l [QtQuickControls2]{Tumbler} is a spinnable wheel of items that - can be selected. - - \endlist - - - \section1 Implementing Application Logic - - A user interface is only a part of an application, and not really useful by itself. - You can use Qt or JavaScript to implement the application logic. For more information on - using JavaScript, see \l{Integrating QML and JavaScript}. - - For an example of how to use JavaScript to develop a game, see the - \l{QML Advanced Tutorial}. - -*/ diff --git a/doc/src/qtquick/qtquick-states-scxml.qdocinc b/doc/src/qtquick/qtquick-states-scxml.qdocinc new file mode 100644 index 0000000000..6614ade1f3 --- /dev/null +++ b/doc/src/qtquick/qtquick-states-scxml.qdocinc @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Creator 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. +** +****************************************************************************/ + +/*! +//! [scxml state machines] + + \section2 Using SCXML State Machines + + To use QML together with an SCXML state machine, add states and bind them to + the state machine in the \uicontrol Backends tab in the Design mode, as + described in \l {Managing C++ Backend Objects}. + + In the \uicontrol States pane, you can edit the \c when condition of states + to map QML states to the states of the SCXML state machine. For an example, + see \l {Qt SCXML Traffic Light QML Example (Dynamic)}. + + \image qmldesigner-states-when-condition.png + + If you add animation to the states, you can run the application to test the + animation. + +//! [scxml state machines] +*/ diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/src/qtquick/qtquick-states.qdoc index 80316aaa4f..d9a6ba95e4 100644 --- a/doc/src/qtquick/qtquick-states.qdoc +++ b/doc/src/qtquick/qtquick-states.qdoc @@ -27,7 +27,7 @@ \contentspage {Qt Creator Manual} \previouspage quick-connections-backend.html \page quick-states.html - \nextpage quick-components.html + \nextpage qtquick-iso-icon-browser.html \title Adding States @@ -79,10 +79,79 @@ You can preview the states in the \uicontrol State pane and click them to switch between states on the canvas. - For more information about using states, see \l{Creating Screens}. + \section1 Using States - If you add animation to the states, you can run the application to test the - animation. + QML states typically describe user interface configurations, such as the UI + controls, their properties and behavior and the available actions. For + example, you can use states to create two screens. - For more information about adding animation, see \l{Animating Screens}. + To add states, click the empty slot in the \uicontrol States pane. + Then modify the new state in the \uicontrol {Form Editor} or the + \uicontrol Properties pane. + + \image qmldesigner-states.png "States pane" + + The properties that you change in a state are highlighted with blue color. + In the \uicontrol {Text Editor}, you can see the changes recorded as changes + to the base state. + + To keep the QML code clean, you should create a base state that contains all + the types you will need in the application. You can then create states, + in which you hide and show a set of items and modify their properties. + This allows you to: + + \list + \li Align items on different screens with each other. + \li Avoid excessive property changes. If an item is invisible in the + base state, you must define all changes to its child types as + property changes, which leads to complicated QML code. + \li Minimize the differences between the base state and the other states + to keep the QML code short and readable and to improve performance. + \li Avoid problems when using transitions and animation when changing + states. + \endlist + + To create screens for an application by using states: + + \list 1 + \li In the base state, add all items you will need in the application + (1). While you work on one screen, you can click the + \inlineimage eye_open.png + icon to hide items on the canvas that are not part of a screen. + \li In the \uicontrol States pane, click the empty slot to create a + new state and give it a name. For example, \c Normal. + \li In the \uicontrol Properties pane (2), deselect the + \uicontrol Visibility check box or set \uicontrol Opacity to 0 + for each item that is not needed in this view. If you specify + the setting for the parent item, all child items inherit it and + are also hidden. + \image qmldesigner-screen-design.png "Designing screens" + \li Create additional states for each screen and set the visibility + or opacity of the items in the screen. + \li To determine which view opens when the application starts, use the + \uicontrol {Text Editor} to set the state of the root item of the + .qml file, as specified by the following code snippet: + \qml + Item { + state: "Normal" + } + \endqml + \endlist + + \include qtquick-states-scxml.qdocinc scxml state machines + + \section1 Animating Transitions Between States + + To make movement between states smooth, you can specify transitions. You can + use different types of animated transitions. For example, you can animate + changes to property values and colors. You can use rotation animation to + control the direction of rotation. For more information, see + \l{Animation and Transitions in Qt Quick}. + + You can use the \c ParallelAnimation type to start several animations at + the same time. Or use the \c SequentialAnimation type to run them one + after another. + + You can use the \uicontrol {Text Editor} to specify transitions. For more + information, see \l{Transition}. */ diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc index d4943517c7..76a197a422 100644 --- a/doc/src/qtquick/qtquick-toolbars.qdoc +++ b/doc/src/qtquick/qtquick-toolbars.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-indenting-code.html \page qt-quick-toolbars.html \nextpage creator-editor-codepasting.html diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/src/qtquick/qtquick-ui-forms.qdoc index a0a516599f..09c82ed400 100644 --- a/doc/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/src/qtquick/qtquick-ui-forms.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -31,7 +31,7 @@ /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage quick-projects.html \page creator-quick-ui-forms.html \nextpage creator-using-qt-quick-designer.html diff --git a/doc/src/vcs/creator-vcs-bazaar.qdoc b/doc/src/vcs/creator-vcs-bazaar.qdoc index 9044c84e3f..5142dc2686 100644 --- a/doc/src/vcs/creator-vcs-bazaar.qdoc +++ b/doc/src/vcs/creator-vcs-bazaar.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-version-control.html \page creator-vcs-bazaar.html \nextpage creator-vcs-clearcase.html diff --git a/doc/src/vcs/creator-vcs-clearcase.qdoc b/doc/src/vcs/creator-vcs-clearcase.qdoc index 000f94b434..7fea2ced5a 100644 --- a/doc/src/vcs/creator-vcs-clearcase.qdoc +++ b/doc/src/vcs/creator-vcs-clearcase.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-bazaar.html \page creator-vcs-clearcase.html \nextpage creator-vcs-cvs.html diff --git a/doc/src/vcs/creator-vcs-cvs.qdoc b/doc/src/vcs/creator-vcs-cvs.qdoc index 047caf9b75..738db2b7bb 100644 --- a/doc/src/vcs/creator-vcs-cvs.qdoc +++ b/doc/src/vcs/creator-vcs-cvs.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-clearcase.html \page creator-vcs-cvs.html \nextpage creator-vcs-git.html diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index d2e364055e..a8c1559748 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-cvs.html \page creator-vcs-git.html \nextpage creator-vcs-mercurial.html diff --git a/doc/src/vcs/creator-vcs-mercurial.qdoc b/doc/src/vcs/creator-vcs-mercurial.qdoc index 4be3855c06..9c0abaf98e 100644 --- a/doc/src/vcs/creator-vcs-mercurial.qdoc +++ b/doc/src/vcs/creator-vcs-mercurial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-git.html \page creator-vcs-mercurial.html \nextpage creator-vcs-perforce.html diff --git a/doc/src/vcs/creator-vcs-perforce.qdoc b/doc/src/vcs/creator-vcs-perforce.qdoc index e86a1423ba..024a19a229 100644 --- a/doc/src/vcs/creator-vcs-perforce.qdoc +++ b/doc/src/vcs/creator-vcs-perforce.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-mercurial.html \page creator-vcs-perforce.html \nextpage creator-vcs-subversion.html diff --git a/doc/src/vcs/creator-vcs-subversion.qdoc b/doc/src/vcs/creator-vcs-subversion.qdoc index 54de2dd62a..9c3ed45b3e 100644 --- a/doc/src/vcs/creator-vcs-subversion.qdoc +++ b/doc/src/vcs/creator-vcs-subversion.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-vcs-perforce.html \page creator-vcs-subversion.html \nextpage creator-configuring-projects.html diff --git a/doc/src/vcs/creator-vcs.qdoc b/doc/src/vcs/creator-vcs.qdoc index 31dc3c14c6..fb868945a3 100644 --- a/doc/src/vcs/creator-vcs.qdoc +++ b/doc/src/vcs/creator-vcs.qdoc @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-project-wizards-xml.html \page creator-version-control.html \nextpage creator-vcs-bazaar.html diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc index 1b8c37f3bb..cef1c5a1ba 100644 --- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage {Creating a Qt Quick Application} \page creator-writing-program.html \nextpage {Creating a Mobile Application} diff --git a/doc/src/widgets/qtdesigner-overview.qdoc b/doc/src/widgets/qtdesigner-overview.qdoc index 5e5ba28a1d..2706f26209 100644 --- a/doc/src/widgets/qtdesigner-overview.qdoc +++ b/doc/src/widgets/qtdesigner-overview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-qml-modules-with-plugins.html \page creator-using-qt-designer.html \nextpage adding-plugins.html diff --git a/doc/src/widgets/qtdesigner-plugins.qdoc b/doc/src/widgets/qtdesigner-plugins.qdoc index aed2f6bc1c..0ddf27a7fc 100644 --- a/doc/src/widgets/qtdesigner-plugins.qdoc +++ b/doc/src/widgets/qtdesigner-plugins.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Creator documentation. @@ -30,7 +30,7 @@ // ********************************************************************** /*! - \contentspage {Qt Creator Manual} + \contentspage index.html \previouspage creator-using-qt-designer.html \page adding-plugins.html \nextpage creator-usability.html diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index dc2c433028..a4a444c760 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -9,6 +9,13 @@ </message> </context> <context> + <name>AddAnalysisMessageSuppressionComment</name> + <message> + <source>Add a Comment to Suppress This Message</source> + <translation>Tilføj en kommentar for at undertrykke denne meddelelse</translation> + </message> +</context> +<context> <name>AddSignalHandlerDialog</name> <message> <source>Implement Signal Handler</source> @@ -167,6 +174,10 @@ <translation>Den installerede SDK-værktøjsversion (%1) inkludere ikke Gradle-scripts. Den minimum krævet Qt version for at Gradle-byg skal kunne virke er %2</translation> </message> <message> + <source>The minimum Qt version required for Gradle build to work is %1. It is recommended to install the latest Qt version.</source> + <translation>Den minimum krævet Qt version for at Gradle-byg skal kunne virke er %1. Det anbefales at installere den seneste Qt version.</translation> + </message> + <message> <source>The minimum Qt version required for Gradle build to work is %2. It is recommended to install the latest Qt version.</source> <translation>Den minimum krævet Qt version for at Gradle-byg skal kunne virke er %2. Det anbefales at installere den seneste Qt version.</translation> </message> @@ -243,6 +254,17 @@ Minimum API-niveauet krævet af kittet er %1.</translation> </message> </context> <context> + <name>Android::AndroidPackageInstallationStep</name> + <message> + <source>Copy application data</source> + <translation>Kopiér programdata</translation> + </message> + <message> + <source>Removing directory %1</source> + <translation>Fjerner mappen %1</translation> + </message> +</context> +<context> <name>Android::Internal::AddNewAVDDialog</name> <message> <source>Create new AVD</source> @@ -479,7 +501,7 @@ Vil du afinstallere den eksisterende pakke?</translation> </message> <message> <source>Unauthorized. Please check the confirmation dialog on your device %1.</source> - <translation>Uautoiseret. Tjek venligst bekræftelsesdialogen på din enhed %1.</translation> + <translation>Uautentificeret. Tjek venligst bekræftelsesdialogen på din enhed %1.</translation> </message> <message> <source>Offline. Please check the state of your device %1.</source> @@ -568,7 +590,7 @@ Vil du afinstallere den eksisterende pakke?</translation> </message> <message> <source>Android: Device authorization error 0x%1</source> - <translation>Android: enhed godkendelsesfejl 0x%1</translation> + <translation>Android: enhed autentificeingsfejl 0x%1</translation> </message> <message> <source>Android: Device API level not supported: error 0x%1</source> @@ -775,6 +797,20 @@ Vil du afinstallere den eksisterende pakke?</translation> </message> </context> <context> + <name>Android::Internal::AndroidPackageInstallationFactory</name> + <message> + <source>Deploy to device</source> + <translation>Udsend til enhed</translation> + </message> +</context> +<context> + <name>Android::Internal::AndroidPackageInstallationStepWidget</name> + <message> + <source>Make install</source> + <translation>Make install</translation> + </message> +</context> +<context> <name>Android::Internal::AndroidPotentialKit</name> <message> <source>Configure Android...</source> @@ -900,7 +936,7 @@ Vil du afinstallere den eksisterende pakke?</translation> </message> <message> <source>SDK manger is not available with the current version of SDK tools. Use native SDK manager.</source> - <translation>SDK manger er ikke tilgængelig med den aktuelle version af SDK-værktøjer. Brug native SDK manager.</translation> + <translation>SDK manger er ikke tilgængelig med den nuværende version af SDK-værktøjer. Brug native SDK manager.</translation> </message> <message> <source>Update Installed</source> @@ -1175,7 +1211,7 @@ Annullerer afventende handlinger... %1 To add the Qt version, select Options > Build & Run > Qt Versions.</source> - <translation>Qt versioner for de følgende arkitekturer mangler: + <translation>Qt versioner for de følgende arkitekturer mangler: %1 Vælg Valgmuligheder > Byg & kør > Qt versioner, for at tilføje Qt versionerne.</translation> @@ -1591,6 +1627,13 @@ APK'en vil ikke kunne bruges på nogen anden enhed.</translation> </message> </context> <context> + <name>AndroidPackageInstallationFactory</name> + <message> + <source>Deploy to device</source> + <translation>Udsend til enhed</translation> + </message> +</context> +<context> <name>AndroidSdkManager</name> <message> <source>Updating installed packages.</source> @@ -1738,8 +1781,12 @@ APK'en vil ikke kunne bruges på nogen anden enhed.</translation> <translation>Kunne ikke sende meddelelse</translation> </message> <message> + <source>Unable to send command line arguments to the already running instance. It does not appear to be responding. Do you want to start a new instance of %1?</source> + <translation>Kunne ikke sende kommandolinjeargumenter til instans som allerede kører. Den ser ikke ud til at svare. Vil du starte en ny instans af %1?</translation> + </message> + <message> <source>Unable to send command line arguments to the already running instance. It appears to be not responding. Do you want to start a new instance of Creator?</source> - <translation>Kunne ikke sende kommandolinjeargumenter til instans som allerede kører. Den ser ikke ud til at svarer. Vil du starte en ny instans af Creator?</translation> + <translation>Kunne ikke sende kommandolinjeargumenter til instans som allerede kører. Den ser ikke ud til at svare. Vil du starte en ny instans af Creator?</translation> </message> <message> <source>Could not find Core plugin in %1</source> @@ -1842,6 +1889,10 @@ APK'en vil ikke kunne bruges på nogen anden enhed.</translation> <translation>Kør &alle tests</translation> </message> <message> + <source>Run All Tests</source> + <translation>Kør alle tests</translation> + </message> + <message> <source>Alt+Shift+T,Alt+A</source> <translation>Alt+Skift+T,Alt+A</translation> </message> @@ -1850,6 +1901,10 @@ APK'en vil ikke kunne bruges på nogen anden enhed.</translation> <translation>&Kør valgte tests</translation> </message> <message> + <source>Run Selected Tests</source> + <translation>Kør valgte tests</translation> + </message> + <message> <source>Alt+Shift+T,Alt+R</source> <translation>Alt+Skift+T,Alt+R</translation> </message> @@ -1952,7 +2007,7 @@ APK'en vil ikke kunne bruges på nogen anden enhed.</translation> </message> <message> <source>A seed of 0 generates a seed based on the current timestamp.</source> - <translation>Et frø som er 0 generer et frø baseret på det aktuelle tidsstempel.</translation> + <translation>Et frø som er 0 generer et frø baseret på det nuværende tidsstempel.</translation> </message> </context> <context> @@ -2090,7 +2145,7 @@ Advarsel: Ren tekst-output mangle nogle informationer (f.eks. varighed)</transla Warning: Plain text misses some information, such as duration.</source> <translation>XML-output anbefales, fordi det forhindre parsing-problemer, mens ren tekst er lettere at læse for mennesker. -Advarsel: Ren tekst mangle nogle informationer, såsom varighed.</translation> +Advarsel: Ren tekst mangle nogle informationer, såsom varighed.</translation> </message> </context> <context> @@ -2101,7 +2156,11 @@ Advarsel: Ren tekst mangle nogle informationer, såsom varighed.</translation> </message> <message> <source>Could not determine which run configuration to choose for running tests (%1)</source> - <translation>Kunne ikke beslutte hvilken kør-konfiguraiton som skulle vælges til at køre tests (%1)</translation> + <translation>Kunne ikke beslutte hvilken kør-konfiguration som skulle vælges til at køre tests (%1)</translation> + </message> + <message> + <source>Could not determine which run configuration to choose for running tests</source> + <translation>Kunne ikke beslutte hvilken kør-konfiguration som skulle vælges til at køre tests</translation> </message> <message> <source>Run Configuration:</source> @@ -2202,6 +2261,13 @@ Advarsel: Ren tekst mangle nogle informationer, såsom varighed.</translation> </message> </context> <context> + <name>Autotest::Internal::TestOutputReader</name> + <message> + <source>Test executable crashed.</source> + <translation>Test-eksekverbaren holdt op med at virke.</translation> + </message> +</context> +<context> <name>Autotest::Internal::TestResultsPane</name> <message> <source>Expand All</source> @@ -2405,7 +2471,7 @@ Måske øg timeouten?</translation> <source>Project is null. Canceling test run. Only desktop kits are supported. Make sure the currently active kit is a desktop kit.</source> <translation>Projekt er nul. Annullerer testkørsel. -Kun desktop kits understøttes. Sørg for at det aktuelt aktive kit er et desktop kit.</translation> +Kun desktop kits understøttes. Sørg for at det nuværende aktive kit er et desktop kit.</translation> </message> <message> <source>Project is not configured. Canceling test run.</source> @@ -2542,6 +2608,18 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba <source>Process arguments</source> <translation>Proces-argumenter</translation> </message> + <message> + <source>Framework</source> + <translation>Framework</translation> + </message> + <message> + <source>Group</source> + <translation>Gruppér</translation> + </message> + <message> + <source>Enables grouping of test cases.</source> + <translation>Aktivér gruppering af testsager.</translation> + </message> </context> <context> <name>Autotest::Internal::TestSettingsWidget</name> @@ -2554,12 +2632,28 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba <translation>Du vil ikke være i stand til at bruge AutoTest-pluginet uden at have mindst ét aktive test-framework.</translation> </message> <message> + <source>Enable or disable test frameworks to be handled by the AutoTest plugin.</source> + <translation>Aktivér eller deaktivér at test-frameworks skal håndteres af AutoTest-pluginet.</translation> + </message> + <message> + <source>Enable or disable grouping of test cases by folder.</source> + <translation>Aktivér eller deaktivér gruppering af testsager efter mappe.</translation> + </message> + <message> <source>Add Filter</source> <translation>Tilføj filter</translation> </message> <message> + <source>Specify a filter expression to be added to the list of filters.<br/>Wildcards are not supported.</source> + <translation>Specificer et filterudtryk som skal tilføjes til listen af filtre.<br/>Jokertegn understøttes ikke.</translation> + </message> + <message> + <source>Specify a filter expression that will replace "%1".<br/>Wildcards are not supported.</source> + <translation>Specificer et filterudtryk som vil erstatte "%1".<br/>Jokertegn understøttes ikke.</translation> + </message> + <message> <source><p>Specify a filter expression to be added to the list of filters.<br/>Wildcards are not supported.</p></source> - <translation><p>Specifier et filterudtryk som skal tilføjes til listen af filtre.<br/>Jokertegn understøttes ikke.</p></translation> + <translation><p>Specificer et filterudtryk som skal tilføjes til listen af filtre.<br/>Jokertegn understøttes ikke.</p></translation> </message> <message> <source>Edit Filter</source> @@ -2567,7 +2661,7 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba </message> <message> <source><p>Specify a filter expression that will replace "%1".<br/>Wildcards are not supported.</p></source> - <translation><p>Specifier et filterudtryk som vil erstatte "%1".<br/>Jokertegn understøttes ikke.</p></translation> + <translation><p>Specificer et filterudtryk som vil erstatte "%1".<br/>Jokertegn understøttes ikke.</p></translation> </message> </context> <context> @@ -3316,7 +3410,7 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> <message> <source>Annotate Current File</source> - <translation>Annotate aktuel fil</translation> + <translation>Annotate nuværende fil</translation> </message> <message> <source>Annotate "%1"</source> @@ -3324,7 +3418,7 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Diff "%1"</source> @@ -3340,7 +3434,7 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> <message> <source>Log Current File</source> - <translation>Log aktuel fil</translation> + <translation>Log nuværende fil</translation> </message> <message> <source>Log "%1"</source> @@ -3356,7 +3450,7 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> <message> <source>Status Current File</source> - <translation>Status aktuel fil</translation> + <translation>Status nuværende fil</translation> </message> <message> <source>Status "%1"</source> @@ -3388,7 +3482,7 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> <message> <source>Revert Current File...</source> - <translation>Tilbagefør aktuel fil...</translation> + <translation>Tilbagefør nuværende fil...</translation> </message> <message> <source>Revert "%1"...</source> @@ -3850,7 +3944,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat <message> <source>Format &Current File</source> <extracomment>Menu entry</extracomment> - <translation>Formatér &aktuelle fil</translation> + <translation>Formatér &nuværende fil</translation> </message> <message> <source>Format &Selected Text</source> @@ -4008,7 +4102,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> <message> <source>Restrict to files contained in the current project</source> - <translation>Begræns til filer som er i det aktuelle projekt</translation> + <translation>Begræns til filer som er i det nuværende projekt</translation> </message> <message> <source>General</source> @@ -4311,6 +4405,13 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> </context> <context> + <name>Bookmarks::Internal::BookmarkFilter</name> + <message> + <source>Bookmarks</source> + <translation>Bogmærker</translation> + </message> +</context> +<context> <name>Bookmarks::Internal::BookmarkManager</name> <message> <source>Edit Bookmark</source> @@ -4357,7 +4458,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> <message> <source>Are you sure you want to remove all bookmarks from all files in the current session?</source> - <translation>Er du sikker på, at du fjerne alle bogmærker fra alle filer i den aktuelle session?</translation> + <translation>Er du sikker på, at du fjerne alle bogmærker fra alle filer i den nuværende session?</translation> </message> </context> <context> @@ -4612,7 +4713,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat <name>CMakeProjectManager</name> <message> <source>Current CMake: %1</source> - <translation>Aktuelle CMake: %1</translation> + <translation>Nuværende CMake: %1</translation> </message> <message> <source>Not in CMakeCache.txt</source> @@ -4707,6 +4808,14 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat <translation>Den valgte CMake-binær har ingen servertilstand og CMake-generatoren genererer ikke en CodeBlocks-fil. %1 vil ikke kunne parse CMake-projekter.</translation> </message> <message> + <source>Platform: %1</source> + <translation>Platform: %1</translation> + </message> + <message> + <source>Toolset: %1</source> + <translation>Værktøjssæt: %1</translation> + </message> + <message> <source>The selected CMake binary has no server-mode and the CMake generator does not generate a CodeBlocks file. Qt Creator will not be able to parse CMake projects.</source> <translation>Den valgte CMake-binær har ingen servertilstand og CMake-generatoren genererer ikke en CodeBlocks-fil. Qt Creator vil ikke kunne parse CMake-projekter.</translation> </message> @@ -4831,7 +4940,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> <message> <source>Current kit: %1</source> - <translation>Aktuelle kit: %1</translation> + <translation>Nuværende kit: %1</translation> </message> <message> <source><UNSET></source> @@ -4995,7 +5104,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> <message> <source>Edit the current CMake configuration value.</source> - <translation>Rediger den aktuelle CMake-konfigurationsværdi.</translation> + <translation>Rediger den nuværende CMake-konfigurationsværdi.</translation> </message> <message> <source>&Unset</source> @@ -5258,7 +5367,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> <message> <source>The executable is not built by the current build configuration</source> - <translation>Eksekverbaren er ikke bygget af den aktuelle byggekonfiguration</translation> + <translation>Eksekverbaren er ikke bygget af den nuværende byggekonfiguration</translation> </message> </context> <context> @@ -5448,6 +5557,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat <translation>CMake-projekt parsing fejlede.</translation> </message> <message> + <source>%1 in line %2</source> + <translation>%1 på linje %2</translation> + </message> + <message> <source>%1 in line %3</source> <translation>%1 på linje %3</translation> </message> @@ -5506,6 +5619,10 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat <translation>Ingen byg-artifacts</translation> </message> <message> + <source>Build artifacts:</source> + <translation>Byg-artifacts:</translation> + </message> + <message> <source>Build artifacts:<br></source> <translation>Byg-artifacts:<br></translation> </message> @@ -5518,7 +5635,7 @@ F.eks., vil "Revision: 15" efterlade grenen ved revision 15.</translat </message> <message> <source>Expected a namespace-name</source> - <translation>Forventede et navnerum-navn</translation> + <translation>Forventede et navnerumnavn</translation> </message> <message> <source>Too many arguments</source> @@ -5713,6 +5830,13 @@ Men brug af de afslappede og udvidet regler betyder også at der ikke kan levere </message> </context> <context> + <name>ClangHoverHandler</name> + <message> + <source>%1 bytes</source> + <translation>%1 byte</translation> + </message> +</context> +<context> <name>ClangRefactoring::ClangQueryProjectsFindFilter</name> <message> <source>Clang Query Project</source> @@ -5963,7 +6087,7 @@ Output: </message> <message> <source>The project configuration changed since the start of the Clang Static Analyzer. Please re-run with current configuration.</source> - <translation>Projekt-konfigurationen blev ændret siden starten af Clang statisk-analysatoren. Kør venligst igen med aktuel konfiguration.</translation> + <translation>Projekt-konfigurationen blev ændret siden starten af Clang statisk-analysatoren. Kør venligst igen med nuværende konfiguration.</translation> </message> <message> <source>Running Clang Static Analyzer on %1</source> @@ -6229,7 +6353,7 @@ Output: </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>&Diff "%1"</source> @@ -6245,7 +6369,7 @@ Output: </message> <message> <source>History Current File</source> - <translation>History aktuel fil</translation> + <translation>History nuværende fil</translation> </message> <message> <source>&History "%1"</source> @@ -6261,7 +6385,7 @@ Output: </message> <message> <source>Annotate Current File</source> - <translation>Annotate aktuel fil</translation> + <translation>Annotate nuværende fil</translation> </message> <message> <source>&Annotate "%1"</source> @@ -6414,7 +6538,7 @@ Output: </message> <message> <source>Set current activity failed: %1</source> - <translation>Sæt af aktuel aktivitet fejlede: %1</translation> + <translation>Sæt af nuværende aktivitet fejlede: %1</translation> </message> <message> <source>Enter &comment:</source> @@ -6620,6 +6744,10 @@ Output: <source><html><head/><body><p><b>Note: You will not be able to check in this file without merging the changes (not supported by the plugin)</b></p></body></html></source> <translation><html><head/><body><p><b>Bemærk: du vil ikke være i stand til at check in denne fil uden sammenlægning af ændringerne (understøttes ikke af pluginet)</b></p></body></html></translation> </message> + <message> + <source>Note: You will not be able to check in this file without merging the changes (not supported by the plugin)</source> + <translation>Bemærk: du vil ikke være i stand til at check in denne fil uden sammenlægning af ændringerne (understøttes ikke af pluginet)</translation> + </message> </context> <context> <name>CodePaster</name> @@ -6862,6 +6990,10 @@ p, li { white-space: pre-wrap; } <translation>Indsætning til KDE-indsætter kræver autentifikation.<br/>Indtast din KDE-identitetslegitimationsoplysninger for at fortsætte.</translation> </message> <message> + <source>Login failed</source> + <translation>Login fejlede</translation> + </message> + <message> <source><span style='background-color:LightYellow;color:red'>Login failed</span><br/><br/></source> <translation><span style='background-color:LightYellow;color:red'>Login fejlede</span><br/><br/></translation> </message> @@ -7643,27 +7775,27 @@ Fortsæt?</translation> </message> <message> <source>The current date (ISO).</source> - <translation>Den aktuelle dato (ISO).</translation> + <translation>Den nuværende dato (ISO).</translation> </message> <message> <source>The current time (ISO).</source> - <translation>Det aktuelle klokkeslæt (ISO).</translation> + <translation>Det nuværende klokkeslæt (ISO).</translation> </message> <message> <source>The current date (RFC2822).</source> - <translation>Den aktuelle dato (RFC2822).</translation> + <translation>Den nuværende dato (RFC2822).</translation> </message> <message> <source>The current time (RFC2822).</source> - <translation>Det aktuelle klokkeslæt (RFC2822).</translation> + <translation>Det nuværende klokkeslæt (RFC2822).</translation> </message> <message> <source>The current date (Locale).</source> - <translation>Den aktuelle dato (lokalt).</translation> + <translation>Den nuværende dato (lokalt).</translation> </message> <message> <source>The current time (Locale).</source> - <translation>Det aktuelle klokkeslæt (lokalt).</translation> + <translation>Det nuværende klokkeslæt (lokalt).</translation> </message> <message> <source>The configured default directory for projects.</source> @@ -7691,7 +7823,7 @@ Fortsæt?</translation> </message> <message> <source>The directory where %1 finds its pre-installed resources.</source> - <translation>Mappen hvor %1 finder sine præ-installeret ressourcer.</translation> + <translation>Mappen hvor %1 finder sine præ-installeret ressourcer.</translation> </message> <message> <source>Is Qt Creator running on Windows?</source> @@ -7715,11 +7847,11 @@ Fortsæt?</translation> </message> <message> <source>The current date (QDate formatstring).</source> - <translation>Den aktuelle dato (QDate-formatstreng).</translation> + <translation>Den nuværende dato (QDate-formatstreng).</translation> </message> <message> <source>The current time (QTime formatstring).</source> - <translation>Det aktuelle klokkeslæt (QTime-formatstreng).</translation> + <translation>Det nuværende klokkeslæt (QTime-formatstreng).</translation> </message> <message> <source>Generate a new UUID.</source> @@ -7905,7 +8037,7 @@ Det gør du ved at skrive denne genvej og et mellemrum i Lokatør-indtastningsfe </message> <message> <source>Remove Current Split</source> - <translation>Fjern aktuelle opdeling</translation> + <translation>Fjern nuværende opdeling</translation> </message> <message> <source>Meta+E,0</source> @@ -7957,15 +8089,15 @@ Det gør du ved at skrive denne genvej og et mellemrum i Lokatør-indtastningsfe </message> <message> <source>Current document</source> - <translation>Aktuelt dokument</translation> + <translation>Nuværende dokument</translation> </message> <message> <source>X-coordinate of the current editor's upper left corner, relative to screen.</source> - <translation>X-koordinat af den aktuelle redigerings øverste venstre hjørne, relativ til skærmen.</translation> + <translation>X-koordinat af den nuværende redigerings øverste venstre hjørne, relativ til skærmen.</translation> </message> <message> <source>Y-coordinate of the current editor's upper left corner, relative to screen.</source> - <translation>Y-koordinat af den aktuelle redigerings øverste venstre hjørne, relativ til skærmen.</translation> + <translation>Y-koordinat af den nuværende redigerings øverste venstre hjørne, relativ til skærmen.</translation> </message> <message> <source>Could not open "%1": Cannot open files of type "%2".</source> @@ -8045,7 +8177,7 @@ Det gør du ved at skrive denne genvej og et mellemrum i Lokatør-indtastningsfe </message> <message> <source>You will lose your current changes if you proceed reverting %1.</source> - <translation>Du vil miste dine aktuelle ændringer hvis du fortsat tilbageføre %1.</translation> + <translation>Du vil miste dine nuværende ændringer hvis du fortsat tilbageføre %1.</translation> </message> <message> <source>Proceed</source> @@ -8125,7 +8257,7 @@ Vil du dræbe den?</translation> </message> <message> <source>Opens the current file in Notepad</source> - <translation>Åbn den aktuelle fil i Notesblok</translation> + <translation>Åbn den nuværende fil i Notesblok</translation> </message> <message> <source>Edit with Notepad</source> @@ -8137,7 +8269,7 @@ Vil du dræbe den?</translation> </message> <message> <source>Runs the current QML file with qmlscene. This requires Qt 5.</source> - <translation>Kører den aktuelle QML-fil med qmlscene. Dette kræver Qt 5.</translation> + <translation>Kører den nuværende QML-fil med qmlscene. Dette kræver Qt 5.</translation> </message> <message> <source>Qt Quick 2 Preview (qmlscene)</source> @@ -8149,7 +8281,7 @@ Vil du dræbe den?</translation> </message> <message> <source>Runs the current QML file with qmlviewer</source> - <translation>Kører den aktuelle QML-fil med qmlviewer</translation> + <translation>Kører den nuværende QML-fil med qmlviewer</translation> </message> <message> <source>Qt Quick 1 Preview (qmlviewer)</source> @@ -8165,7 +8297,7 @@ Vil du dræbe den?</translation> </message> <message> <source>Opens the current file in vi</source> - <translation>Åbner den aktuelle fil i vi</translation> + <translation>Åbner den nuværende fil i vi</translation> </message> <message> <source>Edit with vi</source> @@ -8225,7 +8357,7 @@ Vil du dræbe den?</translation> </source> <translation><html><head/><body> <p>Hvad der skal ske med eksekverbarens standard output. -<ul><li>Ignorer: gør intet med det.</li><li>Vis i rude: vis det i ruden generel-output.</li><li>Erstat markering: erstat den aktuelle markering i det aktuelle dokument med det.</li></ul></p></body></html> +<ul><li>Ignorer: gør intet med det.</li><li>Vis i rude: vis det i ruden generel-output.</li><li>Erstat markering: erstat den nuværende markering i det nuværende dokument med det.</li></ul></p></body></html> </translation> </message> <message> @@ -8255,7 +8387,7 @@ Vil du dræbe den?</translation> <p >Hvad der skal ske med eksekverbarens standard fejl-output.</p> <ul><li>Ignorer: gør intet med det.</li> <li>Vis i rude: vis det i ruden generel-output.</li> -<li>Erstat markering: erstat den aktuelle markering i det aktuelle dokument med det.</li> +<li>Erstat markering: erstat den nuværende markering i det nuværende dokument med det.</li> </ul></body></html></translation> </message> <message> @@ -8276,11 +8408,11 @@ Vil du dræbe den?</translation> </message> <message> <source>If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished.</source> - <translation>Hvis værktøjet ændre det aktuelle dokument, så sæt dette flag for at sikre at dokumentet gemmes før værktøjet køres og genindlæses efter værktøjet afslutter.</translation> + <translation>Hvis værktøjet ændre det nuværende dokument, så sæt dette flag for at sikre at dokumentet gemmes før værktøjet køres og genindlæses efter værktøjet afslutter.</translation> </message> <message> <source>Modifies current document</source> - <translation>Ændre aktuelt dokument</translation> + <translation>Ændre nuværende dokument</translation> </message> <message> <source>Text to pass to the executable via standard input. Leave empty if the executable should not receive any input.</source> @@ -8601,6 +8733,25 @@ Vil du dræbe den?</translation> </message> </context> <context> + <name>Core::Internal::JavaScriptFilter</name> + <message> + <source>Evaluate JavaScript</source> + <translation>Evaluer JavaScript</translation> + </message> + <message> + <source>Reset Engine</source> + <translation>Nulstil motor</translation> + </message> + <message> + <source>Engine aborted after timeout.</source> + <translation>Motor afbrudt efter timeout.</translation> + </message> + <message> + <source>Copy to clipboard: %1</source> + <translation>Kopiér til udklipsholder: %1</translation> + </message> +</context> +<context> <name>Core::Internal::Locator</name> <message> <source>Ctrl+K</source> @@ -8620,7 +8771,7 @@ Vil du dræbe den?</translation> </message> <message> <source><div style="margin-left: 1em">- type <code>%1&lt;space&gt;&lt;pattern&gt;</code> to jump to a function definition</div></source> - <translation><div style="margin-left: 1em">- skriv <code>%1&lt;mellemrum&gt;&lt;mønster&gt;</code> for at hoppe til en funktion-definition</div></translation> + <translation><div style="margin-left: 1em">- skriv <code>%1&lt;mellemrum&gt;&lt;mønster&gt;</code> for at hoppe til en funktionsdefinition</div></translation> </message> <message> <source>Updating Locator Caches</source> @@ -8827,6 +8978,30 @@ Vil du dræbe den?</translation> <translation>Ctrl+L</translation> </message> <message> + <source>Zoom In</source> + <translation>Zoom ind</translation> + </message> + <message> + <source>Ctrl++</source> + <translation>Ctrl++</translation> + </message> + <message> + <source>Zoom Out</source> + <translation>Zoom ud</translation> + </message> + <message> + <source>Ctrl+-</source> + <translation>Ctrl+-</translation> + </message> + <message> + <source>Original Size</source> + <translation>Original størrelse</translation> + </message> + <message> + <source>Meta+0</source> + <translation>Meta+0</translation> + </message> + <message> <source>&Options...</source> <translation>&Valgmuligheder...</translation> </message> @@ -8912,6 +9087,13 @@ Vil du dræbe den?</translation> </message> </context> <context> + <name>Core::Internal::MenuBarFilter</name> + <message> + <source>Actions from the Menu</source> + <translation>Handlinger fra menuen</translation> + </message> +</context> +<context> <name>Core::Internal::MessageOutputWindow</name> <message> <source>General Messages</source> @@ -9526,7 +9708,7 @@ Vil du dræbe den?</translation> </message> <message> <source>Key sequence has potential conflicts. <a href="#conflicts">Show.</a></source> - <translation>Tastesekvens har potientelle konflikter. <a href="#conflicts">Vis.</a></translation> + <translation>Tastesekvens har potentielle konflikter. <a href="#conflicts">Vis.</a></translation> </message> <message> <source>Invalid key sequence.</source> @@ -9712,7 +9894,7 @@ Vil du dræbe den?</translation> <name>Core::Internal::ThemeChooser</name> <message> <source>Current theme: %1</source> - <translation>Aktuelle tema: %1</translation> + <translation>Nuværende tema: %1</translation> </message> <message> <source>Restart Required</source> @@ -9987,7 +10169,7 @@ Vil du check dem out nu?</translation> </message> <message> <source>Current Value: %1</source> - <translation>Aktuel værdi: %1</translation> + <translation>Nuværende værdi: %1</translation> </message> <message> <source>Insert Unexpanded Value</source> @@ -10082,6 +10264,33 @@ til versionsstyring (%2) </message> </context> <context> + <name>CppEditor::CppQuickFixFactory</name> + <message> + <source>Create Getter and Setter Member Functions</source> + <translation>Opret henter- og sætter-medlemsfunktioner</translation> + </message> + <message> + <source>Create Getter Member Function</source> + <translation>Opret henter-medlemsfunktion</translation> + </message> + <message> + <source>Create Setter Member Function</source> + <translation>Opret sætter-medlemsfunktion</translation> + </message> + <message> + <source>Convert to Stack Variable</source> + <translation>Konvertér til stak-variabel</translation> + </message> + <message> + <source>Convert to Pointer</source> + <translation>Konvertér til pointer</translation> + </message> + <message> + <source>Generate Missing Q_PROPERTY Members</source> + <translation>Generer manglende Q_PROPERTY-medlemmer</translation> + </message> +</context> +<context> <name>CppEditor::InsertDeclOperation</name> <message> <source>Add %1 Declaration</source> @@ -10402,11 +10611,11 @@ til versionsstyring (%2) </message> <message> <source>Move All Function Definitions Outside Class</source> - <translation>Flyt alle funktion-definitioner udenfor klasse</translation> + <translation>Flyt alle funktionsdefinitioner udenfor klasse</translation> </message> <message> <source>Move All Function Definitions to %1</source> - <translation>Flyt alle funktion-definitioner til %1</translation> + <translation>Flyt alle funktionsdefinitioner til %1</translation> </message> <message> <source>Move Definition to Class</source> @@ -10462,6 +10671,17 @@ til versionsstyring (%2) </message> </context> <context> + <name>CppTools::ClangBaseChecks</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>For appropriate options, consult the GCC or Clang manual pages or the <a href="https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html">GCC online documentation</a>.</source> + <translation>For passende valgmuligheder, konsulter GCC- eller Clang-manualsiderne eller <a href="https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html">GCC online dokumentationen</a>.</translation> + </message> +</context> +<context> <name>CppTools::ClangDiagnosticConfigsWidget</name> <message> <source>Form</source> @@ -10500,6 +10720,10 @@ til versionsstyring (%2) <translation>Valgmuligheden "%1" er ugyldig.</translation> </message> <message> + <source>Copy this configuration to customize it.</source> + <translation>Kopiér denne konfiguration for at tilpasse den.</translation> + </message> + <message> <source>Configuration passes sanity checks.</source> <translation>Konfiguration består sanity-tjek.</translation> </message> @@ -10508,6 +10732,18 @@ til versionsstyring (%2) <translation>%1</translation> </message> <message> + <source>Clang</source> + <translation>Clang</translation> + </message> + <message> + <source>Clang-Tidy</source> + <translation>Clang-Tidy</translation> + </message> + <message> + <source>Clazy</source> + <translation>Clazy</translation> + </message> + <message> <source>ValidationIcon</source> <translation>Valideringsikon</translation> </message> @@ -10515,6 +10751,49 @@ til versionsstyring (%2) <source>ValidationText</source> <translation>Valideringstekst</translation> </message> + <message> + <source>InfoIcon</source> + <translation>Infoikon</translation> + </message> + <message> + <source>InfoText</source> + <translation>Infotekst</translation> + </message> +</context> +<context> + <name>CppTools::ClazyChecks</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Each level adds checks to the previous level. For more information, see <a href="https://github.com/KDE/clazy">clazy's homepage</a>.</source> + <translation>Hvert niveau tilføjer tjek til det forrige niveau. Se <a href="https://github.com/KDE/clazy">clazy's hjemmeside</a> for mere information.</translation> + </message> + <message> + <source>Disabled</source> + <translation>Deaktiveret</translation> + </message> + <message> + <source>Level 0: No false positives</source> + <translation>Niveau 0: ingen falske positiver</translation> + </message> + <message> + <source>Level 1: Very few false positives</source> + <translation>Niveau 1: meget få falske positiver</translation> + </message> + <message> + <source>Level 2: More false positives</source> + <translation>Niveau 2: flere falske positiver</translation> + </message> + <message> + <source>Not always correct, possibly very noisy, might require a knowledgeable developer to review, might have a very big rate of false-positives, might have bugs.</source> + <translation>Ikke altid korrekt, kan være meget støjende, kan kræve en kyndig udvikler at gennemlæse, kan have en meget stor rate af falske positiver, kan have fejl.</translation> + </message> + <message> + <source>Level 3: Experimental checks</source> + <translation>Niveau 3: eksperimentielle tjek</translation> + </message> </context> <context> <name>CppTools::CppClassesFilter</name> @@ -10607,6 +10886,10 @@ til versionsstyring (%2) <source>Ignore precompiled headers</source> <translation>Ignorer prækompileret headere</translation> </message> + <message> + <source>Clang Diagnostics</source> + <translation>Clang-diagnostik</translation> + </message> </context> <context> <name>CppTools::Internal::CppCodeStyleSettingsPage</name> @@ -10851,7 +11134,7 @@ hvis de ville være justeret med den næste linje</translation> <name>CppTools::Internal::CppCurrentDocumentFilter</name> <message> <source>C++ Symbols in Current Document</source> - <translation>C++-symboler i aktuelt dokument</translation> + <translation>C++-symboler i nuværende dokument</translation> </message> </context> <context> @@ -10876,9 +11159,9 @@ Paths can be absolute or relative to the directory of the current open document. These paths are used in addition to current directory on Switch Header/Source.</source> <translation>Kommasepareret liste af header-stier. -Stier kan være absolut eller relativ til mappen af det aktuelt åbne dokument. +Stier kan være absolut eller relativ til mappen af det nuværende åbne dokument. -Disse stier bruges sammen med den aktuelle mappe på Skift header/kilde.</translation> +Disse stier bruges sammen med den nuværende mappe på Skift header/kilde.</translation> </message> <message> <source>&Prefixes:</source> @@ -10890,7 +11173,7 @@ Disse stier bruges sammen med den aktuelle mappe på Skift header/kilde.</transl These prefixes are used in addition to current file name on Switch Header/Source.</source> <translation>Kommasepareret liste af header-præfikser. -Disse præfikser bruges sammen med det aktuelle filnavn på Skift header/kilde.</translation> +Disse præfikser bruges sammen med det nuværende filnavn på Skift header/kilde.</translation> </message> <message> <source>Sources</source> @@ -10912,9 +11195,9 @@ Paths can be absolute or relative to the directory of the current open document. These paths are used in addition to current directory on Switch Header/Source.</source> <translation>Kommasepareret liste af kilde-stier. -Stier kan være absolut eller relativ til mappen af det aktuelt åbne dokument. +Stier kan være absolut eller relativ til mappen af det nuværende åbne dokument. -Disse stier bruges sammen med den aktuelle mappe på Skift header/kilde.</translation> +Disse stier bruges sammen med den nuværende mappe på Skift header/kilde.</translation> </message> <message> <source>P&refixes:</source> @@ -10926,7 +11209,7 @@ Disse stier bruges sammen med den aktuelle mappe på Skift header/kilde.</transl These prefixes are used in addition to current file name on Switch Header/Source.</source> <translation>Kommasepareret liste af kilde-præfikser. -Disse præfikser bruges sammen med det aktuelle filnavn på Skift header/kilde.</translation> +Disse præfikser bruges sammen med det nuværende filnavn på Skift header/kilde.</translation> </message> <message> <source>&Lower case file names</source> @@ -10956,6 +11239,22 @@ Disse præfikser bruges sammen med det aktuelle filnavn på Skift header/kilde.< </translation> </message> <message> + <source>/************************************************************************** +** %1 license header template +** Special keywords: %USER% %DATE% %YEAR% +** Environment variables: %$VARIABLE% +** To protect a percent sign, use '%%'. +**************************************************************************/ +</source> + <translation>/************************************************************************** +** %1 licens header-skabelon +** Specielle nøgleord: %USER% %DATE% %YEAR% +** Miljøvariabler: %$VARIABLE% +** Brug '%%' for at beskytte et procent-tegn. +**************************************************************************/ +</translation> + </message> + <message> <source>Edit...</source> <translation>Rediger...</translation> </message> @@ -11162,15 +11461,15 @@ Flag: %3</translation> </message> <message> <source>Convert to String Literal</source> - <translation>Konverter til streng-literal</translation> + <translation>Konvertér til streng-literal</translation> </message> <message> <source>Convert to Character Literal and Enclose in QLatin1Char(...)</source> - <translation>Konverter til tegn-literal og omslut i QLatin1Char(...)</translation> + <translation>Konvertér til tegn-literal og omslut i QLatin1Char(...)</translation> </message> <message> <source>Convert to Character Literal</source> - <translation>Konverter til tegn-literal</translation> + <translation>Konvertér til tegn-literal</translation> </message> <message> <source>Enclose in %1(...) (Qt %2)</source> @@ -11186,19 +11485,19 @@ Flag: %3</translation> </message> <message> <source>Convert to Objective-C String Literal</source> - <translation>Konverter til Objective-C-streng-literal</translation> + <translation>Konvertér til Objective-C-streng-literal</translation> </message> <message> <source>Convert to Hexadecimal</source> - <translation>Konverter til heksadecimal</translation> + <translation>Konvertér til heksadecimal</translation> </message> <message> <source>Convert to Octal</source> - <translation>Konverter til oktal</translation> + <translation>Konvertér til oktal</translation> </message> <message> <source>Convert to Decimal</source> - <translation>Konverter til decimal</translation> + <translation>Konvertér til decimal</translation> </message> <message> <source>Add Local Declaration</source> @@ -11206,7 +11505,7 @@ Flag: %3</translation> </message> <message> <source>Convert to Camel Case</source> - <translation>Konverter til Camel Case</translation> + <translation>Konvertér til Camel Case</translation> </message> <message> <source>Add #include %1</source> @@ -11254,7 +11553,78 @@ Flag: %3</translation> </message> <message> <source>Convert connect() to Qt 5 Style</source> - <translation>Konverter connect() til Qt 5-stil</translation> + <translation>Konvertér connect() til Qt 5-stil</translation> + </message> +</context> +<context> + <name>CppTools::TidyChecks</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>android-*</source> + <translation>android-*</translation> + </message> + <message> + <source>boost-*</source> + <translation>boost-*</translation> + </message> + <message> + <source>bugprone-*</source> + <translation>bugprone-*</translation> + </message> + <message> + <source>cert-*</source> + <translation>cert-*</translation> + </message> + <message> + <source>cppcoreguidelines-*</source> + <translation>cppcoreguidelines-*</translation> + </message> + <message> + <source>clang-analyzer-*</source> + <translation>clang-analyzer-*</translation> + </message> + <message> + <source>clang-diagnostic-*</source> + <translation>clang-diagnostic-*</translation> + </message> + <message> + <source>google-*</source> + <translation>google-*</translation> + </message> + <message> + <source>hicpp-*</source> + <translation>hicpp-*</translation> + </message> + <message> + <source>llvm-*</source> + <translation>llvm-*</translation> + </message> + <message> + <source>misc-*</source> + <translation>misc-*</translation> + </message> + <message> + <source>modernize-*</source> + <translation>modernize-*</translation> + </message> + <message> + <source>mpi-*</source> + <translation>mpi-*</translation> + </message> + <message> + <source>objc-*</source> + <translation>objc-*</translation> + </message> + <message> + <source>performance-*</source> + <translation>performance-*</translation> + </message> + <message> + <source>readability-*</source> + <translation>readability-*</translation> </message> </context> <context> @@ -11325,7 +11695,7 @@ Flag: %3</translation> </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Diff "%1"</source> @@ -11341,7 +11711,7 @@ Flag: %3</translation> </message> <message> <source>Filelog Current File</source> - <translation>Filelog aktuel fil</translation> + <translation>Filelog nuværende fil</translation> </message> <message> <source>Filelog "%1"</source> @@ -11349,7 +11719,7 @@ Flag: %3</translation> </message> <message> <source>Annotate Current File</source> - <translation>Annotate aktuel fil</translation> + <translation>Annotate nuværende fil</translation> </message> <message> <source>Annotate "%1"</source> @@ -11373,7 +11743,7 @@ Flag: %3</translation> </message> <message> <source>Commit Current File</source> - <translation>Commit aktuel fil</translation> + <translation>Commit nuværende fil</translation> </message> <message> <source>Commit "%1"</source> @@ -11754,6 +12124,11 @@ Flag: %3</translation> <translation>32-bit version</translation> </message> <message> + <source>Specify the path to the <a href="%1">Windows Console Debugger executable</a> (%2) here.</source> + <extracomment>Label text for path configuration. %2 is "x-bit version".</extracomment> + <translation>Specificer stien til <a href="%1">Windows Console Debugger-eksekverbar</a> (%2) her.</translation> + </message> + <message> <source><html><body><p>Specify the path to the <a href="%1">Windows Console Debugger executable</a> (%2) here.</p></body></html></source> <extracomment>Label text for path configuration. %2 is "x-bit version".</extracomment> <translation><html><body><p>Specificer stien til <a href="%1">Windows Console Debugger-eksekverbar</a> (%2) her.</p></body></html></translation> @@ -11941,7 +12316,7 @@ Flag: %3</translation> </message> <message> <source>A debugging session is still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it?</source> - <translation>En fejlretningssession er stadig i gang. Terminering af sessionen i den aktuelle tilstand kan efterlade målet i en inkonsistent tilstand. Vil du stadig terminere den?</translation> + <translation>En fejlretningssession er stadig i gang. Terminering af sessionen i den nuværende tilstand kan efterlade målet i en inkonsistent tilstand. Vil du stadig terminere den?</translation> </message> <message> <source>Debugged executable</source> @@ -12273,6 +12648,14 @@ Flag: %3</translation> <translation><p>Fejlretter-kommandoer som skal eksekveres når brudpunktet rammes. Denne facilitet er kun tilgængelig til GDB.</translation> </message> <message> + <source>Specifying the module (base name of the library or executable) for function or file type breakpoints can significantly speed up debugger startup times (CDB, LLDB).</source> + <translation>Specificering af modulet (grundnavn på biblioteket eller eksekverbaren) til funktion- eller filtype-brudpunkter kan gøre opstart af fejlretteren betydeligt hurtigere (CDB, LLDB).</translation> + </message> + <message> + <source>Debugger commands to be executed when the breakpoint is hit. This feature is only available for GDB.</source> + <translation>Fejlretter-kommandoer som skal eksekveres når brudpunktet rammes. Denne facilitet er kun tilgængelig til GDB.</translation> + </message> + <message> <source>&Commands:</source> <translation>&Kommandoer:</translation> </message> @@ -12402,7 +12785,7 @@ Flag: %3</translation> </message> <message> <source>Are you sure you want to remove all breakpoints from all files in the current session?</source> - <translation>Er du sikker på, at du fjerne alle brudpunkter fra alle filer i den aktuelle session?</translation> + <translation>Er du sikker på, at du fjerne alle brudpunkter fra alle filer i den nuværende session?</translation> </message> <message> <source>Add Breakpoint</source> @@ -12654,6 +13037,16 @@ Hvis du byggede Qt Creator fra kilder og vil bruge en CDB-eksekverbar med anden så skal du bygge en separat CDB-udvidelse med den samme bitness som den CDB du vil bruge.</translation> </message> <message> + <source>Internal error: The extension %1 cannot be found. +If you have updated %2 via Maintenance Tool, you may need to rerun the Tool and select "Add or remove components" and then select the Qt > Tools > Qt Creator CDB Debugger Support component. +If you build %2 from sources and want to use a CDB executable with another bitness than your %2 build, you will need to build a separate CDB extension with the same bitness as the CDB you want to use.</source> + <translation>Intern fejl: Udvidelsen %1 kan ikke findes. +Hvis du har opdatet %2 via vedligeholdelsesværktøj, så kan det være at du skal køre værktøjet igen og vælge "Tilføj eller fjern komponenter" og så vælge +Qt > Værktøjer > Qt Creator > Qt Creator CDB-fejlretter-understøttelse-komponenten. +Hvis du byggede %2 fra kilder og vil bruge en CDB-eksekverbar med anden bitness end din %2-byg, +så skal du bygge en separat CDB-udvidelse med den samme bitness som den CDB du vil bruge.</translation> + </message> + <message> <source>Interrupting is not possible in remote sessions.</source> <translation>Afbrydning er ikke muligt i fjern-sessioner.</translation> </message> @@ -12830,7 +13223,7 @@ så skal du bygge en separat CDB-udvidelse med den samme bitness som den CDB du </message> <message> <source>Stopping and stepping in the debugger will automatically open views associated with the current location.</source> - <translation>Stopning og trinvis gennemgang i fejlretteren vil automatisk åbne visninger som er tilknyttet den aktuelle placering.</translation> + <translation>Stopning og trinvis gennemgang i fejlretteren vil automatisk åbne visninger som er tilknyttet den nuværende placering.</translation> </message> <message> <source>Close temporary source views on debugger exit</source> @@ -12906,7 +13299,7 @@ så skal du bygge en separat CDB-udvidelse med den samme bitness som den CDB du </message> <message> <source>Scrolls the editor only when it is necessary to keep the current line in view, instead of keeping the next statement centered at all times.</source> - <translation>Ruller kun redigeringen når det er nødvendigt for at holde den aktuelle linje i visning, i stedet for altid at holde det næste udsagn centreret.</translation> + <translation>Ruller kun redigeringen når det er nødvendigt for at holde den nuværende linje i visning, i stedet for altid at holde det næste udsagn centreret.</translation> </message> <message> <source>Maximum stack depth:</source> @@ -13299,13 +13692,17 @@ Sætning af brudpunkter efter filnavn og linjenummer kan fejle.</translation> <translation><html><head/><body><p>Du prøver at køre værktøjet "%1" på et program i %2-tilstand. Værktøjet er designet til at blive brugt %3.</p><p>Run-time-karakteristika er betydeligt forskellige mellem optimeret og ikke-optimeret binære. Analytiske fund for en tilstand kan eller kan ikke være relevante for den anden.</p><p>Kørsel af værktøjer som behøver fejlretsymboler på binære som ikke har nogen kan lede til manglende funktionsnavne eller på anden måde utiltrækkelig output.</p><p>Vil du fortsætte og køre værktøjet i %2-tilstand?</p></body></html></translation> </message> <message> + <source>Unable to create a debugging engine. Please select a Debugger Setting from the Run page of the project mode.</source> + <translation>Kan ikke oprette en fejlrettermotor.Vælg venligst en fejlretterindstilling fra kør-siden i projekt-tilstanden.</translation> + </message> + <message> <source>Unable to create a debugging engine.</source> <translation>Kan ikke oprette en fejlrettermotor.</translation> </message> <message> <source>Some breakpoints cannot be handled by the debugger languages currently active, and will be ignored. Affected are breakpoints %1</source> - <translation>Nogle brudpunkter kan ikke håndteres af det aktuelt aktive fejlretter sprog og vil blive ignoreret. + <translation>Nogle brudpunkter kan ikke håndteres af det nuværende aktive fejlretter sprog og vil blive ignoreret. Påvirket brudpunkter er %1</translation> </message> <message> @@ -13442,6 +13839,14 @@ Påvirket brudpunkter er %1</translation> <translation>Kildefiler</translation> </message> <message> + <source>Locals</source> + <translation>Locals</translation> + </message> + <message> + <source>&Expressions</source> + <translation>&Expressions</translation> + </message> + <message> <source>Snapshots</source> <translation>Øjebliksbilleder</translation> </message> @@ -14574,6 +14979,10 @@ Du kan vælge mellem at vente længere tid eller afbryde fejlretning.</numerusfo <translation>Det kan være på grund af en begrænsning på stilængde i kerne-filen.</translation> </message> <message> + <source>Try to specify the binary in Debug > Start Debugging > Load Core File.</source> + <translation>Prøv at specificere binæren i Fejlret > Start fejlretning > Indlæs kernefil.</translation> + </message> + <message> <source>Try to specify the binary in Debug > Start Debugging > Attach to Core.</source> <translation>Prøv at specificere binæren i Fejlret > Start fejlretning > Kobl til kerne.</translation> </message> @@ -14688,7 +15097,7 @@ that on slow machines. In this case, the value should be increased.</source> GDB-proces som ikke svare. Standardværdien på 20 sekunder bør være nok for de fleste programmer men der er situationer hvor indlæsning af store biblioteker eller visning af kildefiler tager meget -længere på lansomme maskiner. Værdien bør i dette tilfælde øges.</translation> +længere på langsomme maskiner. Værdien bør i dette tilfælde øges.</translation> </message> <message> <source>sec</source> @@ -14814,7 +15223,7 @@ In this case, the value should be increased.</source> ikke svare termineres. Standardværdien på 20 sekunder bør være nok for de fleste programmer men der er situationer hvor indlæsning af store biblioteker eller visning af kildefiler tager meget -længere på lansomme maskiner. Værdien bør i dette tilfælde øges.</translation> +længere på langsomme maskiner. Værdien bør i dette tilfælde øges.</translation> </message> <message> <source>Extended</source> @@ -14846,7 +15255,7 @@ længere på lansomme maskiner. Værdien bør i dette tilfælde øges.</translat </message> <message> <source><html><head/><body><p>Enables stepping backwards.</p><p><b>Note:</b> This feature is very slow and unstable on the GDB side. It exhibits unpredictable behavior when going backwards over system calls and is very likely to destroy your debugging session.</p></body></html></source> - <translation><html><head/><body><p>Aktiverer baglæns trinvis gennemgang.</p><p><b>Bemærk:</b> Denne facilitet er meget langsom og ustabil på GDB-siden. Den udviser uforudsigelig adværd når der gås tilbage over systemkald og kan med stor sandsynlighed ødelægge din fejlretningssession.</p></body></html></translation> + <translation><html><head/><body><p>Aktiverer baglæns trinvis gennemgang.</p><p><b>Bemærk:</b> Denne facilitet er meget langsom og ustabil på GDB-siden. Den udviser uforudsigelig adfærd når der gås tilbage over systemkald og kan med stor sandsynlighed ødelægge din fejlretningssession.</p></body></html></translation> </message> <message> <source><html><head/><body>Keeps debugging all children after a fork.</body></html></source> @@ -15128,6 +15537,10 @@ længere på lansomme maskiner. Værdien bør i dette tilfælde øges.</translat <translation><html><head/><body><p>Python-kommandoer indtastet her vil blive eksekveret efter indbyggede fejlretningshjælpere er blevet indlæst og fuldt initialiseret. Du kan indlæse yderligere fejlretningshjælpere eller ændre de eksisterende her.</p></body></html></translation> </message> <message> + <source>Python commands entered here will be executed after built-in debugging helpers have been loaded and fully initialized. You can load additional debugging helpers or modify existing ones here.</source> + <translation>Python-kommandoer indtastet her vil blive eksekveret efter indbyggede fejlretningshjælpere er blevet indlæst og fuldt initialiseret. Du kan indlæse yderligere fejlretningshjælpere eller ændre de eksisterende her.</translation> + </message> + <message> <source>Extra Debugging Helpers</source> <translation>Ekstra fejlretningshjælpere</translation> </message> @@ -15184,7 +15597,7 @@ Du kan blive spurgt om at dele indholdet af denne log ved rapportering af fejl r </message> <message> <source>User commands are not accepted in the current state.</source> - <translation>Brugerkommandoer accepteres ikke i den aktuelle tilstand.</translation> + <translation>Brugerkommandoer accepteres ikke i den nuværende tilstand.</translation> </message> <message> <source>Log File</source> @@ -15363,7 +15776,7 @@ Vil du prøve igen?</translation> </message> <message> <source>Cannot evaluate %1 in current stack frame.</source> - <translation>Kan ikke evaluere %1 i aktuelle stakramme.</translation> + <translation>Kan ikke evaluere %1 i nuværende stakramme.</translation> </message> <message> <source>Context:</source> @@ -16334,7 +16747,7 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug </message> <message> <source>Copy Current Value to Clipboard</source> - <translation>Kopiér aktuelle værdi til udklipsholder</translation> + <translation>Kopiér nuværende værdi til udklipsholder</translation> </message> <message> <source>Open View Contents in Editor</source> @@ -16446,7 +16859,7 @@ Du kan vælge andre kommunikationskanaler her, såsom en seriel linje eller brug </message> <message> <source>Use Format for Type (Currently %1)</source> - <translation>Brug format for type (aktuelt %1)</translation> + <translation>Brug format for type (nuværende %1)</translation> </message> <message> <source>Use Display Format Based on Type</source> @@ -16967,7 +17380,7 @@ Det hjælper måske at genbygge projektet.</translation> </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Meta+H</source> @@ -17367,6 +17780,10 @@ Det hjælper måske at genbygge projektet.</translation> <translation>Eksportér egenskab som alias</translation> </message> <message> + <source>Insert Keyframe</source> + <translation>Indsæt keyframe</translation> + </message> + <message> <source>Binding Editor</source> <translation>Binding-redigering</translation> </message> @@ -17491,7 +17908,7 @@ Det hjælper måske at genbygge projektet.</translation> </message> <message> <source>%1 (current: "%2")</source> - <translation>%1 (aktuel: "%2")</translation> + <translation>%1 (nuværende: "%2")</translation> </message> </context> <context> @@ -18193,7 +18610,7 @@ vil også deaktiverer følgende plugins: </message> <message> <source>Sets the capitalization for the text.</source> - <translation>Sæt store/små bogstaver for teksten.</translation> + <translation>Sætter store/små bogstaver for teksten.</translation> </message> <message> <source>Font weight</source> @@ -18201,7 +18618,7 @@ vil også deaktiverer følgende plugins: </message> <message> <source>Sets the font's weight.</source> - <translation>Sæt skrifttypens vægt.</translation> + <translation>Sætter skrifttypens vægt.</translation> </message> <message> <source>Style</source> @@ -18217,7 +18634,7 @@ vil også deaktiverer følgende plugins: </message> <message> <source>Sets the word spacing for the font.</source> - <translation>Sæt ordenes mellemrum for skrifttypen.</translation> + <translation>Sætter ordenes mellemrum for skrifttypen.</translation> </message> <message> <source>Letter</source> @@ -18225,7 +18642,33 @@ vil også deaktiverer følgende plugins: </message> <message> <source>Sets the letter spacing for the font.</source> - <translation>Sæt bogstavernes mellemrum for skrifttypen.</translation> + <translation>Sætter bogstavernes mellemrum for skrifttypen.</translation> + </message> + <message> + <source>Performance</source> + <translation>Ydelse</translation> + </message> + <message> + <source>Kerning</source> + <translation>Knibning</translation> + </message> + <message> + <source>Enables or disables the kerning OpenType feature when shaping the text. Disabling this may improve performance when creating or changing the text, at the expense of some cosmetic features. The default value is true.</source> + <translation>Aktiverer eller deaktiverer OpenType-faciliteten knibning når teksten formes. Deaktivering af den kan forbedre ydelsen når teksten oprettes eller ændres, på bekostning af nogle kosmetiske faciliteter. Standardværdien er sand.</translation> + </message> + <message> + <source>Prefer shaping</source> + <translation>Foretræk formning</translation> + </message> + <message> + <source>Sometimes, a font will apply complex rules to a set of characters in order to display them correctly. +In some writing systems, such as Brahmic scripts, this is required in order for the text to be legible, whereas in Latin script, + it is merely a cosmetic feature. Setting the preferShaping property to false will disable all such features +when they are not required, which will improve performance in most cases.</source> + <translation>Nogen gange anvender en skrifttype komplekse regler til et sæt af tegn, for at vise dem korrekt. +I nogle skrivesystemer, såsom brahmanske skrifter, kræves dette for at teksten er letlæselig, mens det i latinsk skrift, + blot er en kosmetisk facilitet. Hvis preferShaping-egenskaben sættes til falsk deaktiveres alle sådanne faciliteter +når de ikke kræves, hvilket i de fleste tilfælde vil forbedre ydelsen.</translation> </message> </context> <context> @@ -18864,6 +19307,24 @@ Delvise navne kan bruges hvis de er utvetydige.</translation> <translation>Antal commits mellem %1 og %2: %3</translation> </message> <message> + <source>Checked - Mark change as WIP. +Unchecked - Mark change as ready for review. +Partially checked - Do not change current state.</source> + <translation>Tilvalgt - Mærk ændring som WIP. +Fravalgt - Mærk ændring som klar til gennemlæsning. +Delvist tilvalgt - Skift ikke den nuværende tilstand.</translation> + </message> + <message> + <source>Supported on Gerrit 2.15 and later.</source> + <translation>Understøttes i Gerrit 2.15 og senere.</translation> + </message> + <message> + <source>Checked - The change is a draft. +Unchecked - The change is not a draft.</source> + <translation>Tilvalgt - Ændringen er en kladde. +Fravalgt - Ændringen er ikke en kladde.</translation> + </message> + <message> <source>No remote branches found. This is probably the initial commit.</source> <translation>Ingen fjern-grene fundet. Dette er formodentligt den indledende commit.</translation> </message> @@ -18875,6 +19336,22 @@ Delvise navne kan bruges hvis de er utvetydige.</translation> <source>... Include older branches ...</source> <translation>... inkluder ældre grene ...</translation> </message> + <message> + <source>Checked - Mark change as private. +Unchecked - Remove mark. +Partially checked - Do not change current state.</source> + <translation>Tilvalgt - Mærk ændring som privat. +Fravalgt - Fjern mærke. +Delvist tilvalgt - Skift ikke den nuværende tilstand.</translation> + </message> + <message> + <source>&Draft/private</source> + <translation>&Kladde/privat</translation> + </message> + <message> + <source>&Work-in-progress</source> + <translation>&Igangværende arbejde</translation> + </message> </context> <context> <name>Gerrit::Internal::GerritRemoteChooser</name> @@ -19008,7 +19485,7 @@ Vil du terminere den?</translation> </message> <message> <source>Create Branch Stash for Current Branch</source> - <translation>Opret gren-stash for aktuel gren</translation> + <translation>Opret gren-stash for nuværende gren</translation> </message> </context> <context> @@ -19059,7 +19536,7 @@ Vil du terminere den?</translation> </message> <message> <source>Set current branch to track the selected one.</source> - <translation>Sæt aktuelt gren til at track den valgte.</translation> + <translation>Sæt nuværende gren til at track den valgte.</translation> </message> <message> <source>&Track</source> @@ -19284,6 +19761,10 @@ Vil du terminere den?</translation> <source>Ignore whitespace only changes.</source> <translation>Ignorer ændringer som kun består af mellemrum.</translation> </message> + <message> + <source>Reload</source> + <translation>Genindlæs</translation> + </message> </context> <context> <name>Git::Internal::GitClient</name> @@ -19379,6 +19860,14 @@ Vil du terminere den?</translation> <source>Cannot run "%1" in "%2": %3</source> <translation>Kan ikke køre "%1" i "%2": %3</translation> </message> + <message> + <source>Nothing to recover</source> + <translation>Intet at gendanne</translation> + </message> + <message> + <source>Files recovered</source> + <translation>Filer gendannet</translation> + </message> <message numerus="yes"> <source>Cannot reset %n files in "%1": %2</source> <translation> @@ -19753,6 +20242,10 @@ Commit nu?</translation> <source>Show textual graph log.</source> <translation>Vis textual graph log.</translation> </message> + <message> + <source>Reload</source> + <translation>Genindlæs</translation> + </message> </context> <context> <name>Git::Internal::GitPlugin</name> @@ -19770,11 +20263,11 @@ Commit nu?</translation> </message> <message> <source>Current &File</source> - <translation>Aktuel &fil</translation> + <translation>Nuværende &fil</translation> </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Diff of "%1"</source> @@ -19790,7 +20283,7 @@ Commit nu?</translation> </message> <message> <source>Log Current File</source> - <translation>Log aktuel fil</translation> + <translation>Log nuværende fil</translation> </message> <message> <source>Log of "%1"</source> @@ -19806,7 +20299,7 @@ Commit nu?</translation> </message> <message> <source>Blame Current File</source> - <translation>Blame aktuel fil</translation> + <translation>Blame nuværende fil</translation> </message> <message> <source>Blame for "%1"</source> @@ -19870,11 +20363,11 @@ Commit nu?</translation> </message> <message> <source>Current &Project</source> - <translation>Aktuelt &projekt</translation> + <translation>Nuværende &projekt</translation> </message> <message> <source>Diff Current Project</source> - <translation>Diff aktuelt projekt</translation> + <translation>Diff nuværende projekt</translation> </message> <message> <source>Diff Project "%1"</source> @@ -19961,6 +20454,10 @@ Commit nu?</translation> <translation>Nulstil...</translation> </message> <message> + <source>Recover Deleted Files</source> + <translation>Gendan slettede filer</translation> + </message> + <message> <source>Interactive Rebase...</source> <translation>Interaktiv rebase...</translation> </message> @@ -20034,7 +20531,7 @@ Commit nu?</translation> </message> <message> <source>Saves the current state of your work and resets the repository.</source> - <translation>Gemmer den aktuelle tilstand af dit arbejde og nulstiller repository'et.</translation> + <translation>Gemmer den nuværende tilstand af dit arbejde og nulstiller repository'et.</translation> </message> <message> <source>Stash Unstaged Files</source> @@ -20042,7 +20539,7 @@ Commit nu?</translation> </message> <message> <source>Saves the current state of your unstaged files and resets the repository to its staged state.</source> - <translation>Gemmer den aktuelle tilstand af dine unstaged filer og nulstiller repository'et til sin staged tilstand.</translation> + <translation>Gemmer den nuværende tilstand af dine unstaged filer og nulstiller repository'et til sin staged tilstand.</translation> </message> <message> <source>Take Snapshot...</source> @@ -20050,7 +20547,7 @@ Commit nu?</translation> </message> <message> <source>Saves the current state of your work.</source> - <translation>Gemmer den aktuelle tilstand af dit arbejde.</translation> + <translation>Gemmer den nuværende tilstand af dit arbejde.</translation> </message> <message> <source>Stash Pop</source> @@ -20118,7 +20615,7 @@ Commit nu?</translation> </message> <message> <source>Gitk Current File</source> - <translation>Gitk aktuel fil</translation> + <translation>Gitk nuværende fil</translation> </message> <message> <source>Gitk of "%1"</source> @@ -20126,7 +20623,7 @@ Commit nu?</translation> </message> <message> <source>Gitk for folder of Current File</source> - <translation>Gitk for mappe af aktuel fil</translation> + <translation>Gitk for mappe af nuværende fil</translation> </message> <message> <source>Gitk for folder of "%1"</source> @@ -20620,11 +21117,11 @@ i stedet for i dens installationsmappe når der køres udenfor git bash.</transl </message> <message> <source>not currently set</source> - <translation>ikke aktuelt sat</translation> + <translation>ikke nuværende sat</translation> </message> <message> <source>currently set to "%1"</source> - <translation>aktuelt sat til "%1"</translation> + <translation>nuværende sat til "%1"</translation> </message> <message> <source>Git Repository Browser Command</source> @@ -20909,7 +21406,7 @@ Lad være tom for at gennemsøge filsystemet.</translation> </message> <message> <source>Follows current</source> - <translation>Følger aktuelle</translation> + <translation>Følger nuværende</translation> </message> <message> <source>Determines whether the highlight is managed by the view.</source> @@ -21115,7 +21612,7 @@ Tilføj, ændr, og fjern dokumentfiltre, som beslutter hvilke dokumentationssæt </message> <message> <source>Use &Current Page</source> - <translation>Brug &aktuel side</translation> + <translation>Brug &nuværende side</translation> </message> <message> <source>Use &Blank Page</source> @@ -22225,14 +22722,14 @@ Id'er skal begynde med et lille bogstav.</translation> </message> <message numerus="yes"> <source>Starting simulator devices...</source> - <translation type="unfinished"> + <translation> <numerusform>Starter simulatorenhed...</numerusform> <numerusform>Starter simulatorenheder...</numerusform> </translation> </message> <message> <source>Cannot start simulator (%1, %2) in current state: %3</source> - <translation>Kan ikke starte simulator (%1, %2) i aktuelle tilstand: %3</translation> + <translation>Kan ikke starte simulator (%1, %2) i nuværende tilstand: %3</translation> </message> <message> <source>simulator start</source> @@ -22256,11 +22753,25 @@ Fejl: %2</translation> </message> <message numerus="yes"> <source>Do you really want to reset the contents and settings of the selected devices?</source> - <translation type="unfinished"> + <translation> <numerusform>Vil du virkelig nulstille indholdet og indstillingerne af den valgte enhed?</numerusform> <numerusform>Vil du virkelig nulstille indholdet og indstillingerne af de valgte enheder?</numerusform> </translation> </message> + <message numerus="yes"> + <source>Starting %n simulator device(s)...</source> + <translation> + <numerusform>Starter %n simulatorenhed...</numerusform> + <numerusform>Starter %n simulatorenheder...</numerusform> + </translation> + </message> + <message numerus="yes"> + <source>Do you really want to reset the contents and settings of the %n selected device(s)?</source> + <translation> + <numerusform>Vil du virkelig nulstille indholdet og indstillingerne af den valgte enhed?</numerusform> + <numerusform>Vil du virkelig nulstille indholdet og indstillingerne af de %n valgte enheder?</numerusform> + </translation> + </message> <message> <source>Resetting contents and settings...</source> <translation>Nulstiller indhold og indstillinger...</translation> @@ -22290,15 +22801,36 @@ Fejl: %2</translation> <translation>Slet enhed</translation> </message> <message numerus="yes"> + <source>Do you really want to delete the %n selected device(s)?</source> + <translation> + <numerusform>Vil du virkelig slette den valgte enhed?</numerusform> + <numerusform>Vil du virkelig slette de %n valgte enheder?</numerusform> + </translation> + </message> + <message numerus="yes"> + <source>Deleting %n simulator device(s)...</source> + <translation> + <numerusform>Sletter %n simulatorenhed...</numerusform> + <numerusform>Sletter %n simulatorenheder...</numerusform> + </translation> + </message> + <message numerus="yes"> + <source>Capturing screenshots from %n device(s)...</source> + <translation> + <numerusform>Tager skærmbilleder fra %n enhed...</numerusform> + <numerusform>Tager skærmbilleder fra %n enheder...</numerusform> + </translation> + </message> + <message numerus="yes"> <source>Do you really want to delete the selected devices?</source> - <translation type="unfinished"> + <translation> <numerusform>Vil du virkelig slette den valgte enhed?</numerusform> <numerusform>Vil du virkelig slette de valgte enheder?</numerusform> </translation> </message> <message numerus="yes"> <source>Deleting simulator devices...</source> - <translation type="unfinished"> + <translation> <numerusform>Sletter simulatorenhed...</numerusform> <numerusform>Sletter simulatorenheder...</numerusform> </translation> @@ -22309,7 +22841,7 @@ Fejl: %2</translation> </message> <message numerus="yes"> <source>Capturing screenshots from devices...</source> - <translation type="unfinished"> + <translation> <numerusform>Tager skærmbilleder fra enhed...</numerusform> <numerusform>Tager skærmbilleder fra enheder...</numerusform> </translation> @@ -22349,7 +22881,7 @@ Fejl: %2</translation> </message> <message> <source>Current State</source> - <translation>Aktuelle tilstand</translation> + <translation>Nuværende tilstand</translation> </message> </context> <context> @@ -22481,7 +23013,7 @@ Fejl: %5</translation> </message> <message> <source>The item will expand as much as possible while respecting the given constraints if true.</source> - <translation>Posterne vil udvidde så meget som muligt mens de angivne begrænsninger respekteres hvis sand.</translation> + <translation>Posterne vil udvidde så meget som muligt mens de givne begrænsninger respekteres hvis sand.</translation> </message> <message> <source>Fill width</source> @@ -22647,7 +23179,7 @@ Fejl: %5</translation> </message> <message> <source>Follows current</source> - <translation>Følger aktuelle</translation> + <translation>Følger nuværende</translation> </message> <message> <source>Determines whether the highlight is managed by the view.</source> @@ -22970,7 +23502,7 @@ Fejl: %5</translation> </message> <message> <source>%v/%m Bytes</source> - <translation>%v/%m bytes</translation> + <translation>%v/%m byte</translation> </message> <message> <source>Restart</source> @@ -22981,6 +23513,10 @@ Fejl: %5</translation> <translation>Afslut</translation> </message> <message> + <source>%1 has crashed</source> + <translation>%1 holdt op med at virke</translation> + </message> + <message> <source>We specifically send the following information: </source> @@ -23180,7 +23716,7 @@ Fejl: %5</translation> </message> <message> <source>Annotate Current File</source> - <translation>Annotate aktuel fil</translation> + <translation>Annotate nuværende fil</translation> </message> <message> <source>Annotate "%1"</source> @@ -23188,7 +23724,7 @@ Fejl: %5</translation> </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Diff "%1"</source> @@ -23204,7 +23740,7 @@ Fejl: %5</translation> </message> <message> <source>Log Current File</source> - <translation>Log aktuel fil</translation> + <translation>Log nuværende fil</translation> </message> <message> <source>Log "%1"</source> @@ -23220,7 +23756,7 @@ Fejl: %5</translation> </message> <message> <source>Status Current File</source> - <translation>Status aktuel fil</translation> + <translation>Status nuværende fil</translation> </message> <message> <source>Status "%1"</source> @@ -23252,7 +23788,7 @@ Fejl: %5</translation> </message> <message> <source>Revert Current File...</source> - <translation>Tilbagefør aktuel fil...</translation> + <translation>Tilbagefør nuværende fil...</translation> </message> <message> <source>Revert "%1"...</source> @@ -23524,8 +24060,12 @@ Fejl: %5</translation> <translation>Nulstil zoom</translation> </message> <message> + <source>Export Selected Elements...</source> + <translation>Eksportér valgte elementer...</translation> + </message> + <message> <source>Open Parent Diagram</source> - <translation>Åbn forælder diagram</translation> + <translation>Åbn forælderdiagram</translation> </message> <message> <source>Add Package</source> @@ -23544,6 +24084,14 @@ Fejl: %5</translation> <translation>Tilføj lærreddiagram</translation> </message> <message> + <source>Synchronize Browser and Diagram</source> + <translation>Synkroniser browser og diagram</translation> + </message> + <message> + <source>Press && Hold for Options</source> + <translation>Tryk-og-hold for valgmuligheder</translation> + </message> + <message> <source>Synchronize Browser and Diagram<br><i><small>Press&Hold for options</small></i></source> <translation>Synkroniser browser og diagram<br><i><small>Tryk-og-&hold for valgmuligheder</small></i></translation> </message> @@ -23648,6 +24196,18 @@ Fejl: %5</translation> <translation>Eksportér diagram</translation> </message> <message> + <source>Export Selected Elements</source> + <translation>Eksportér valgte elementer</translation> + </message> + <message> + <source>Exporting Selected Elements Failed</source> + <translation>Eksport af valgte elementer fejlede</translation> + </message> + <message> + <source>Exporting the selected elements of the current diagram into file<br>"%1"<br>failed.</source> + <translation>Eksport af de valgte elementer af det nuværende diagram ind i filen <br>"%1"<br>fejlede.</translation> + </message> + <message> <source>Exporting Diagram Failed</source> <translation>Eksport af diagram fejlede</translation> </message> @@ -23656,22 +24216,42 @@ Fejl: %5</translation> <translation>Eksport af diagrammet ind i filen <br>"%1"<br>fejlede.</translation> </message> <message> + <source>New %1</source> + <translation>Ny %1</translation> + </message> + <message> <source>Package</source> <translation>Pakke</translation> </message> <message> + <source>New Package</source> + <translation>Ny pakke</translation> + </message> + <message> <source>Component</source> <translation>Komponent</translation> </message> <message> + <source>New Component</source> + <translation>Ny komponent</translation> + </message> + <message> <source>Class</source> <translation>Klasse</translation> </message> <message> + <source>New Class</source> + <translation>Ny klasse</translation> + </message> + <message> <source>Item</source> <translation>Post</translation> </message> <message> + <source>New Item</source> + <translation>Ny post</translation> + </message> + <message> <source>Annotation</source> <translation>Annotation</translation> </message> @@ -24008,7 +24588,7 @@ Fejl: %5</translation> <name>NimRunConfiguration</name> <message> <source>Current Build Target</source> - <translation>Aktuelle byggemål</translation> + <translation>Nuværende byggemål</translation> </message> </context> <context> @@ -24302,7 +24882,7 @@ Fejl: %5</translation> </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Diff "%1"</source> @@ -24310,7 +24890,7 @@ Fejl: %5</translation> </message> <message> <source>Annotate Current File</source> - <translation>Annotate aktuel fil</translation> + <translation>Annotate nuværende fil</translation> </message> <message> <source>Annotate "%1"</source> @@ -24318,7 +24898,7 @@ Fejl: %5</translation> </message> <message> <source>Filelog Current File</source> - <translation>Filelog aktuel fil</translation> + <translation>Filelog nuværende fil</translation> </message> <message> <source>Filelog "%1"</source> @@ -24406,7 +24986,7 @@ Fejl: %5</translation> </message> <message> <source>Diff Current Project/Session</source> - <translation>Diff aktuelt projekt/session</translation> + <translation>Diff nuværende projekt/session</translation> </message> <message> <source>Diff Project "%1"</source> @@ -24446,7 +25026,7 @@ Fejl: %5</translation> </message> <message> <source>Update Current Project</source> - <translation>Opdater aktuelt projekt</translation> + <translation>Opdater nuværende projekt</translation> </message> <message> <source>Update Project "%1"</source> @@ -24945,10 +25525,41 @@ Reason: %3</source> </message> </context> <context> + <name>ProcessCreator</name> + <message> + <source>Executable does not exist: %1</source> + <translation>Eksekverbar findes ikke: %1</translation> + </message> + <message> + <source>Unknown error occurred.</source> + <translation>Der opstod en ukendt fejl.</translation> + </message> + <message> + <source>Process crashed.</source> + <translation>Proces holdt op med at virke.</translation> + </message> + <message> + <source>Process failed at startup.</source> + <translation>Proces fejlede ved opstart.</translation> + </message> + <message> + <source>Process timed out.</source> + <translation>Proces fik timeout.</translation> + </message> + <message> + <source>Cannot write to process.</source> + <translation>Kan ikke skive til proces.</translation> + </message> + <message> + <source>Cannot read from process.</source> + <translation>Kan ikke læse fra proces.</translation> + </message> +</context> +<context> <name>ProjectExplorer</name> <message> <source>Name of current build</source> - <translation>Navn på aktuelt byg</translation> + <translation>Navn på nuværende byg</translation> </message> <message> <source>Devices</source> @@ -24976,19 +25587,19 @@ Reason: %3</source> </message> <message> <source>Main file of current project</source> - <translation>Hovedfil af aktuelle projekt</translation> + <translation>Hovedfil af nuværende projekt</translation> </message> <message> <source>Name of current project</source> - <translation>Navn på aktuelt projekt</translation> + <translation>Navn på nuværende projekt</translation> </message> <message> <source>Type of current build</source> - <translation>Type på aktuelt byg</translation> + <translation>Type på nuværende byg</translation> </message> <message> <source>The currently active run configuration's name.</source> - <translation>Det aktuelt aktive kør-konfigurations navn.</translation> + <translation>Det nuværende aktive kør-konfigurations navn.</translation> </message> </context> <context> @@ -25117,11 +25728,11 @@ Reason: %3</source> </message> <message> <source>Name of current build</source> - <translation>Navn på aktuelt byg</translation> + <translation>Navn på nuværende byg</translation> </message> <message> <source>Variables in the current build environment</source> - <translation>Variabler i det aktuelle bygmiljø</translation> + <translation>Variabler i det nuværende bygmiljø</translation> </message> <message> <source>System Environment</source> @@ -25208,6 +25819,19 @@ Reason: %3</source> </message> </context> <context> + <name>ProjectExplorer::BuildStepList</name> + <message> + <source>Build</source> + <extracomment>Display name of the build build step list. Used as part of the labels in the project window.</extracomment> + <translation>Byg</translation> + </message> + <message> + <source>Clean</source> + <extracomment>Display name of the clean build step list. Used as part of the labels in the project window.</extracomment> + <translation>Rens</translation> + </message> +</context> +<context> <name>ProjectExplorer::BuildableHelperLibrary</name> <message> <source>Cannot start process: %1</source> @@ -25408,7 +26032,7 @@ kan ikke findes i stien.</translation> </message> <message> <source>Object class-name:</source> - <translation>Objekt klasse-navn:</translation> + <translation>Objekt klassenavn:</translation> </message> <message> <source>URI:</source> @@ -25469,6 +26093,7 @@ kan ikke findes i stien.</translation> <name>ProjectExplorer::DeployConfigurationFactory</name> <message> <source>Deploy Configuration</source> + <extracomment>Display name of the default deploy configuration</extracomment> <translation>Udsend-konfiguration</translation> </message> </context> @@ -25559,6 +26184,10 @@ kan ikke findes i stien.</translation> <translation>DebugBreakProcess fejlede:</translation> </message> <message> + <source>%1 does not exist. If you built %2 yourself, check out https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.</source> + <translation>%1 findes ikke. Hvis du selv byggede %2, så tjek https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.</translation> + </message> + <message> <source>%1 does not exist. If you built Qt Creator yourself, check out https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.</source> <translation>%1 findes ikke. Hvis du selv byggede Qt Creator, så tjek https://code.qt.io/cgit/qt-creator/binary-artifacts.git/.</translation> </message> @@ -25743,11 +26372,11 @@ kan ikke findes i stien.</translation> <name>ProjectExplorer::EnvironmentIdAccessor</name> <message> <source><p>No .user settings file created by this instance of Qt Creator was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%1"?</p></source> - <translation><p>Fandt ingen bruger-indstillingsfil oprettet af denne instans af Qt Creator.</p><p>Arbejder du med dette projekt på anden maskine eller brugte en anden indstillingssti før?</p><p>Vil du stadig indlæse indstillingsfilen "%1"?</p></translation> + <translation><p>Fandt ingen .user-indstillingsfil oprettet af denne instans af Qt Creator.</p><p>Arbejdede du tidligere med dette projekt på anden maskine eller brugte en anden indstillingssti?</p><p>Vil du stadig indlæse indstillingsfilen "%1"?</p></translation> </message> <message> <source><p>No .user settings file created by this instance of %1 was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%2"?</p></source> - <translation><p>Fandt ingen bruger-indstillingsfil oprettet af denne instans af %1.</p><p>Arbejder du med dette projekt på anden maskine eller brugte en anden indstillingssti før?</p><p>Vil du stadig indlæse indstillingsfilen "%2"?</p></translation> + <translation><p>Fandt ingen .user-indstillingsfil oprettet af denne instans af %1.</p><p>Arbejdede du tidligere med dette projekt på anden maskine eller brugte en anden indstillingssti?</p><p>Vil du stadig indlæse indstillingsfilen "%2"?</p></translation> </message> <message> <source>Settings File for "%1" from a different Environment?</source> @@ -25760,6 +26389,10 @@ kan ikke findes i stien.</translation> <source>The environment setting value is invalid.</source> <translation>Miljøindstillingsværdien er ugyldig.</translation> </message> + <message> + <source>Environment</source> + <translation>Miljø</translation> + </message> </context> <context> <name>ProjectExplorer::EnvironmentValidator</name> @@ -26093,7 +26726,7 @@ Ekskludering: %2 <name>ProjectExplorer::Internal::CurrentProjectFilter</name> <message> <source>Files in Current Project</source> - <translation>Filer i aktuelt projekt</translation> + <translation>Filer i nuværende projekt</translation> </message> </context> <context> @@ -26104,7 +26737,7 @@ Ekskludering: %2 </message> <message> <source>Current Project</source> - <translation>Aktuelt projekt</translation> + <translation>Nuværende projekt</translation> </message> <message> <source>Project "%1":</source> @@ -26379,7 +27012,7 @@ Ekskludering: %2 </message> <message> <source>Current state:</source> - <translation>Aktuel tilstand:</translation> + <translation>Nuværende tilstand:</translation> </message> <message> <source>Type Specific</source> @@ -26474,14 +27107,26 @@ Ekskludering: %2 <context> <name>ProjectExplorer::Internal::FolderNavigationWidget</name> <message> + <source>The file "%1" was renamed to "%2", but the following projects could not be automatically changed: %3</source> + <translation>Filen "%1" blev omdøbt til "%2", men følgende projekter kunne ikke ændres automatisk: %3</translation> + </message> + <message> <source>Show Hidden Files</source> <translation>Vis skjulte filer</translation> </message> <message> + <source>Show Bread Crumbs</source> + <translation>Vis brødkrummer</translation> + </message> + <message> <source>Synchronize with Editor</source> <translation>Synkroniser med redigering</translation> </message> <message> + <source>The following projects failed to automatically remove the file: %1</source> + <translation>Følgende projekter kunne ikke automatisk fjerne filen: %1</translation> + </message> + <message> <source>Open Project "%1"</source> <translation>Åbn projekt "%1"</translation> </message> @@ -26537,6 +27182,10 @@ Ekskludering: %2 <translation>Alt+Y</translation> </message> <message> + <source>Options</source> + <translation>Valgmuligheder</translation> + </message> + <message> <source>Filter Files</source> <translation>Filtrer filer</translation> </message> @@ -26854,7 +27503,7 @@ Ekskludering: %2 </message> <message> <source>Current directory</source> - <translation>Aktuel mappe</translation> + <translation>Nuværende mappe</translation> </message> <message> <source>Directory</source> @@ -26964,6 +27613,10 @@ Ekskludering: %2 <source>Limit application output to</source> <translation>Begræns program-output til</translation> </message> + <message> + <source>Limit build output to</source> + <translation>Begræns byg-output til</translation> + </message> </context> <context> <name>ProjectExplorer::Internal::ProjectFileWizardExtension</name> @@ -27074,7 +27727,7 @@ til projektet "%2".</translation> </message> <message> <source>%1 (current session)</source> - <translation>%1 (aktuel session)</translation> + <translation>%1 (nuværende session)</translation> </message> <message> <source>Clone</source> @@ -27643,6 +28296,70 @@ til projektet "%2".</translation> <translation>Ved parsing af feltet "%1": %2</translation> </message> <message> + <source>Label ("%1") data is not an object.</source> + <translation>Etiketdata ("%1") er ikke et objekt.</translation> + </message> + <message> + <source>Label ("%1") has no trText.</source> + <translation>Etiket ("%1") har ingen trText.</translation> + </message> + <message> + <source>Spacer ("%1") data is not an object.</source> + <translation>Spacer-data ("%1") er ikke et objekt.</translation> + </message> + <message> + <source>Spacer ("%1") property "factor" is no integer value.</source> + <translation>Spacer ("%1") egenskaben "factor" er ikke en heltalsværdi.</translation> + </message> + <message> + <source>LineEdit ("%1") data is not an object.</source> + <translation>Linjeredigeringsdata ("%1") er ikke et objekt..</translation> + </message> + <message> + <source>LineEdit ("%1") has an invalid regular expression "%2" in "validator".</source> + <translation>Linjeredigering ("%1") har et ugyldigt regulært udtryk "%2" i "validator".</translation> + </message> + <message> + <source>TextEdit ("%1") data is not an object.</source> + <translation>Tekstredigeringsdata ("%1") er ikke et objekt.</translation> + </message> + <message> + <source>CheckBox ("%1") data is not an object.</source> + <translation>CheckBox-data ("%1") er ikke et objekt.</translation> + </message> + <message> + <source>CheckBox ("%1") values for checked and unchecked state are identical.</source> + <translation>CheckBox-værdier ("%1") for tilvalgt og fravalgt tilstand er identiske.</translation> + </message> + <message> + <source>No JSON lists allowed inside List items.</source> + <translation>Ingen JSON-lister tilladt inden i List-items.</translation> + </message> + <message> + <source>No "key" found in List items.</source> + <translation>Ingen "key" fundet i List-items.</translation> + </message> + <message> + <source>%1 ("%2") data is not an object.</source> + <translation>%1-data ("%2") er ikke et objekt.</translation> + </message> + <message> + <source>%1 ("%2") "index" is not an integer value.</source> + <translation>%1 ("%2") "index" er ikke en heltalsværdi.</translation> + </message> + <message> + <source>%1 ("%2") "disabledIndex" is not an integer value.</source> + <translation>%1 ("%2") "disabledIndex" er ikke en heltalsværdi.</translation> + </message> + <message> + <source>%1 ("%2") "items" missing.</source> + <translation>%1 ("%2") "items" mangler.</translation> + </message> + <message> + <source>%1 ("%2") "items" is not a JSON list.</source> + <translation>%1 ("%2") "items" er ikke en JSON-liste.</translation> + </message> + <message> <source>Label data is not an object.</source> <translation>Etiketdata er ikke et objekt.</translation> </message> @@ -27660,7 +28377,7 @@ til projektet "%2".</translation> </message> <message> <source>LineEdit data is not an object.</source> - <translation>LineEdit-data er ikke et objekt.</translation> + <translation>Linjeredigeringsdata er ikke et objekt.</translation> </message> <message> <source>Invalid regular expression "%1" in "validator".</source> @@ -27668,7 +28385,7 @@ til projektet "%2".</translation> </message> <message> <source>TextEdit data is not an object.</source> - <translation>TextEdit-data er ikke et objekt.</translation> + <translation>Tekstredigeringsdata er ikke et objekt.</translation> </message> <message> <source>PathChooser data is not an object.</source> @@ -27987,7 +28704,7 @@ til projektet "%2".</translation> </message> <message> <source>Test case name:</source> - <translation>Test-sag-navn:</translation> + <translation>Testsagnavn:</translation> </message> <message> <source>Requires QApplication</source> @@ -27999,7 +28716,7 @@ til projektet "%2".</translation> </message> <message> <source>Test set name:</source> - <translation>Test-sæt-navn:</translation> + <translation>Test-sætnavn:</translation> </message> <message> <source>Enable C++11</source> @@ -28190,6 +28907,10 @@ til projektet "%2".</translation> <translation>JS-fil</translation> </message> <message> + <source>Qt 5.10</source> + <translation>Qt 5.10</translation> + </message> + <message> <source>Model name:</source> <translation>Modelnavn:</translation> </message> @@ -28222,6 +28943,14 @@ til projektet "%2".</translation> <translation>Opretter en tom Nim-fil ved brug af UTF-8-tegnsæt.</translation> </message> <message> + <source>Google Test</source> + <translation>Google-test</translation> + </message> + <message> + <source>Qt Quick Test</source> + <translation>Qt Quick-test</translation> + </message> + <message> <source>Nim</source> <translation>Nim</translation> </message> @@ -28398,6 +29127,14 @@ Prævælger en desktop Qt til bygning af programmet, hvis tilgængeligt.</transl <translation>Brug Qt virtuelt tastatur</translation> </message> <message> + <source>Creates a scratch model using a temporary file.</source> + <translation>Opretter en scratch-model ved brug af en midlertidig fil.</translation> + </message> + <message> + <source>Scratch Model</source> + <translation>Scratch-model</translation> + </message> + <message> <source>Creates a Qt Canvas 3D QML project, optionally including three.js.</source> <translation>Opretter et Qt Canvas 3D QML-projekt, med valgfri inkludering af three.js.</translation> </message> @@ -28631,7 +29368,7 @@ Brug det kun hvis du prototyper. Du kan ikke oprette et fuldt program med dette. </message> <message> <source>Switch the checkout in the current directory to the new branch.</source> - <translation>Skift checkout'en i den aktuelle mappe til den nye gren.</translation> + <translation>Skift checkout'en i den nuværende mappe til den nye gren.</translation> </message> <message> <source>Hardlink</source> @@ -28982,15 +29719,15 @@ Brug det kun hvis du prototyper. Du kan ikke oprette et fuldt program med dette. </message> <message> <source>The name of the currently active kit.</source> - <translation>Navnet på det aktuelt aktive kit.</translation> + <translation>Navnet på det nuværende aktive kit.</translation> </message> <message> <source>The name of the currently active kit in a filesystem-friendly version.</source> - <translation>Navnet på det aktuelt aktive kit i en filsystem venlig version.</translation> + <translation>Navnet på det nuværende aktive kit i en filsystem venlig version.</translation> </message> <message> <source>The id of the currently active kit.</source> - <translation>Id'et af det aktuelt aktive kit.</translation> + <translation>Id'et af det nuværende aktive kit.</translation> </message> <message> <source>Clone of %1</source> @@ -29363,7 +30100,7 @@ Luk venligst alle kørende instanser af dit program før en byg startes.</transl </message> <message> <source>Diff Against Current File</source> - <translation>Diff mod aktuelle fil</translation> + <translation>Diff mod nuværende fil</translation> </message> <message> <source>Set as Active Project</source> @@ -29391,67 +30128,67 @@ Luk venligst alle kørende instanser af dit program før en byg startes.</transl </message> <message> <source>Current project's main file.</source> - <translation>Aktuelle projekts hovedfil.</translation> + <translation>Nuværende projekts hovedfil.</translation> </message> <message> <source>Full build path of the current project's active build configuration.</source> - <translation>Fuld byggesti på det aktuelle projekts aktive byggekonfiguration.</translation> + <translation>Fuld byggesti på det nuværende projekts aktive byggekonfiguration.</translation> </message> <message> <source>The name of the current project.</source> - <translation>Navnet på det aktuelle projekt.</translation> + <translation>Navnet på det nuværende projekt.</translation> </message> <message> <source>The name of the currently active kit.</source> - <translation>Navnet på det aktuelt aktive kit.</translation> + <translation>Navnet på det nuværende aktive kit.</translation> </message> <message> <source>The name of the currently active kit as a filesystem-friendly version.</source> - <translation>Navnet på det aktuelt aktive kit som en filsystem venlig version.</translation> + <translation>Navnet på det nuværende aktive kit som en filsystem venlig version.</translation> </message> <message> <source>The ID of the currently active kit.</source> - <translation>ID'et af det aktuelt aktive kit.</translation> + <translation>ID'et af det nuværende aktive kit.</translation> </message> <message> <source>The host address of the device in the currently active kit.</source> - <translation>Værtsadressen på enheden i det aktuelt aktive kit.</translation> + <translation>Værtsadressen på enheden i det nuværende aktive kit.</translation> </message> <message> <source>The SSH port of the device in the currently active kit.</source> - <translation>SSH-porten på enheden i det aktuelt aktive kit.</translation> + <translation>SSH-porten på enheden i det nuværende aktive kit.</translation> </message> <message> <source>The username with which to log into the device in the currently active kit.</source> - <translation>Brugernavnet som der skal logges ind på enheden i det aktuelt aktive kit.</translation> + <translation>Brugernavnet som der skal logges ind på enheden i det nuværende aktive kit.</translation> </message> <message> <source>The private key file with which to authenticate when logging into the device in the currently active kit.</source> - <translation>Den private nøgle-fil som der skal bruges til at autentificere med når der logges ind på enheden i det aktuelt aktive kit.</translation> + <translation>Den private nøgle-fil som der skal bruges til at autentificere med når der logges ind på enheden i det nuværende aktive kit.</translation> </message> <message> <source>The currently active build configuration's name.</source> - <translation>Det aktuelt aktive byggekonfigurations navn.</translation> + <translation>Det nuværende aktive byggekonfigurations navn.</translation> </message> <message> <source>The currently active run configuration's name.</source> - <translation>Det aktuelt aktive kør-konfigurations navn.</translation> + <translation>Det nuværende aktive kør-konfigurations navn.</translation> </message> <message> <source>The currently active run configuration's executable (if applicable).</source> - <translation>Den aktuelt aktive kør-konfigurations eksekverbar (hvis anvendelig).</translation> + <translation>Den nuværende aktive kør-konfigurations eksekverbar (hvis anvendelig).</translation> </message> <message> <source>The currently active build configuration's type.</source> - <translation>Det aktuelt aktive byggekonfigurations type.</translation> + <translation>Det nuværende aktive byggekonfigurations type.</translation> </message> <message> <source>File where current session is saved.</source> - <translation>Fil hvor aktuelle session gemmes.</translation> + <translation>Fil hvor nuværende session gemmes.</translation> </message> <message> <source>Name of current session.</source> - <translation>Navn på aktuel session.</translation> + <translation>Navn på nuværende session.</translation> </message> <message> <source>Load Project</source> @@ -29521,7 +30258,7 @@ Luk venligst alle kørende instanser af dit program før en byg startes.</transl <message> <source>Found some build errors in current task. Do you want to ignore them?</source> - <translation>Fandt nogle byggefejl i aktuel opgave. + <translation>Fandt nogle byggefejl i nuværende opgave. Vil du ignorere dem?</translation> </message> <message> @@ -29765,7 +30502,7 @@ Omdøb %2 til %3 alligevel?</translation> </message> <message> <source>Variables in the current run environment</source> - <translation>Variabler i det aktuelle kør-miljø</translation> + <translation>Variabler i det nuværende kør-miljø</translation> </message> <message> <source>The Project is currently being parsed.</source> @@ -30025,7 +30762,7 @@ Disse filer bevares.</numerusform> </message> <message> <source>Process listing command failed with exit code %1.</source> - <translation>Proces som viser kommando fejlde med afslutningskode %1.</translation> + <translation>Proces som viser kommando fejlede med afslutningskode %1.</translation> </message> <message> <source>Error: Kill process failed: %1</source> @@ -30081,6 +30818,10 @@ Disse filer bevares.</numerusform> <translation>Vælg alle kits</translation> </message> <message> + <source>Type to filter kits by name...</source> + <translation>Skriv for at filtrere kits efter navn...</translation> + </message> + <message> <source>Select Kits for Your Project</source> <translation>Vælg kits til dit projekt</translation> </message> @@ -30107,7 +30848,7 @@ Disse filer bevares.</numerusform> <name>ProjectExplorer::Task</name> <message> <source>You asked to build the current Run Configuration's build target only, but it is not associated with a build target. Update the Make Step in your build settings.</source> - <translation>Du spurgte om kun at bygge det aktuelle kør-konfigurations byggemål, men det er ikke tilknyttet et byggemål. Opdater Make-trinnet i dine byggeindstillinger.</translation> + <translation>Du spurgte om kun at bygge det nuværende kør-konfigurations byggemål, men det er ikke tilknyttet et byggemål. Opdater Make-trinnet i dine byggeindstillinger.</translation> </message> <message> <source>Qt Creator needs a compiler set up to build. Configure a compiler in the kit options.</source> @@ -30267,6 +31008,10 @@ Udløbsdato: %3</translation> <translation>Puppet starter ...</translation> </message> <message> + <source>Puppet is starting...</source> + <translation>Puppet starter...</translation> + </message> + <message> <source>You can now attach your debugger to the %1 puppet with process id: %2.</source> <translation>Du kan nu koble din fejlretter til %1-puppet'en med process-id: %2.</translation> </message> @@ -30291,6 +31036,10 @@ Udløbsdato: %3</translation> <translation>Kit er ugyldigt</translation> </message> <message> + <source>The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. For example the compiler can be misconfigured. Fix the kit configuration and restart %1. Otherwise, the fallback emulation layer, which does not support all features, will be used.</source> + <translation>QML-emuleringslaget (QML Puppet) kan ikke bygges forbi kittet ikke er konfigureret korrekt. F.eks. kan kompileren være fejlkonfigureret. Ret kit-konfigurationen og genstart %1. Ellers bruges tilbagefalds-emuleringslaget, som ikke understøtter alle faciliteter.</translation> + </message> + <message> <source>The QML emulation layer (QML Puppet) cannot be built because the kit is not configured correctly. For example the compiler can be misconfigured. Fix the kit configuration and restart Qt Creator. Otherwise, the fallback emulation layer, which does not support all features, will be used.</source> <translation>QML-emuleringslaget (QML Puppet) kan ikke bygges forbi kittet ikke er konfigureret korrekt. F.eks. kan kompileren være fejlkonfigureret. Ret kit-konfigurationen og genstart Qt Creator. Ellers bruges tilbagefalds-emuleringslaget, som ikke understøtter alle faciliteter.</translation> </message> @@ -30348,6 +31097,13 @@ Udløbsdato: %3</translation> </message> </context> <context> + <name>QObject</name> + <message> + <source>C++ Usages:</source> + <translation>C++-anvendelser:</translation> + </message> +</context> +<context> <name>QSsh::Internal::SftpChannelPrivate</name> <message> <source>Server could not start SFTP subsystem.</source> @@ -31193,7 +31949,7 @@ Udløbsdato: %3</translation> <name>QbsProjectManager::Internal::QbsRunConfiguration</name> <message> <source>The .qbs files are currently being parsed.</source> - <translation>.qbs-filerne er aktuelt ved at blive parset.</translation> + <translation>.qbs-filerne er nuværende ved at blive parset.</translation> </message> <message> <source>Parsing of .qbs files has failed.</source> @@ -31215,6 +31971,10 @@ Udløbsdato: %3</translation> <translation>Eksekverbar:</translation> </message> <message> + <source>Add library paths to run environment</source> + <translation>Tilføj biblioteksstier til kør-miljø</translation> + </message> + <message> <source><unknown></source> <translation><ukendt></translation> </message> @@ -31401,7 +32161,7 @@ Filerne i Android-pakke kildemappen kopieres til bygmappens Android-mappe og sta </message> <message> <source>Remove currently selected library from list.</source> - <translation>Fjern aktuelt valgt bibliotek fra liste.</translation> + <translation>Fjern nuværende valgt bibliotek fra liste.</translation> </message> <message> <source>Remove</source> @@ -31646,7 +32406,7 @@ Opdater venligst dit kit eller vælg en mkspec for qmake som matcher dit mål-mi </message> <message> <source>Specify the list of custom widgets and their properties.</source> - <translation>Specifier listen af brugerdefineret widgets og deres egenskaber.</translation> + <translation>Specificer listen af brugerdefineret widgets og deres egenskaber.</translation> </message> <message> <source>Widget &Classes:</source> @@ -32476,6 +33236,10 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil <translation>QML-fejlretning</translation> </message> <message> + <source>QMake Configuration</source> + <translation>QMake-konfiguration</translation> + </message> + <message> <source>The option will only take effect if the project is recompiled. Do you want to recompile now?</source> <translation>Denne valgmulighed vil kun virke hvis projektet genkompileres. Vil du genkompilere nu?</translation> </message> @@ -32676,6 +33440,21 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil </message> </context> <context> + <name>QmlDebug::QmlDebugConnectionManager</name> + <message> + <source>Debug connection opened.</source> + <translation>Fejlret-forbindelse åbnet.</translation> + </message> + <message> + <source>Debug connection closed.</source> + <translation>Fejlret-forbindelse lukket.</translation> + </message> + <message> + <source>Debug connection failed.</source> + <translation>Fejlret-forbindelse fejlede.</translation> + </message> +</context> +<context> <name>QmlDebug::QmlOutputParser</name> <message> <source>The port seems to be in use.</source> @@ -32715,7 +33494,7 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil </message> <message> <source>Choose a type that is registered using qmlRegisterType or qmlRegisterSingletonType. The type will be available as a property in the current .qml file.</source> - <translation>Vælg en type som er registreret ved brug af qmlRegisterType eller qmlRegisterSingletonType. Typen vil være tilgængelig som en egenskab i den aktuelle.qml-fil.</translation> + <translation>Vælg en type som er registreret ved brug af qmlRegisterType eller qmlRegisterSingletonType. Typen vil være tilgængelig som en egenskab i den nuværende .qml-fil.</translation> </message> </context> <context> @@ -32832,6 +33611,10 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil <translation>Ignorer altid disse ikke-understøttede Qt Quick Designer-advarsler.</translation> </message> <message> + <source>Always ignore these warnings about features not supported by Qt Quick Designer.</source> + <translation>Ignorer altid disse advarsler om faciliteter som ikke understøttes af Qt Quick Designer.</translation> + </message> + <message> <source>Cannot open this QML document because of an error in the QML file:</source> <translation>Kan ikke åbne dette QML-dokument på grund af en fejl i QML-filen:</translation> </message> @@ -32907,7 +33690,7 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil </message> <message> <source>Export Current QML File as Image</source> - <translation>Eksportér aktuelle QML-fil som billede</translation> + <translation>Eksportér nuværende QML-fil som billede</translation> </message> <message> <source>PNG (*.png);;JPG (*.jpg)</source> @@ -33121,6 +33904,10 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil <translation>Ugyldig type %1</translation> </message> <message> + <source>Unknown property for Imports %1</source> + <translation>Ukendt egenskab for importer %1</translation> + </message> + <message> <source>Unknown property for Type %1</source> <translation>Ukendt egenskab for type %1</translation> </message> @@ -33408,6 +34195,34 @@ Hverken stien til biblioteket eller stien til dets includere føjes til .pro-fil <comment>Library search input hint text</comment> <translation><filter></translation> </message> + <message> + <source>Add New Resources...</source> + <translation>Tilføj nye ressourcer...</translation> + </message> + <message> + <source>Add new resources to project.</source> + <translation>Tilføj nye ressourcer til projekt.</translation> + </message> + <message> + <source>Add import %1</source> + <translation>Tilføj import %1</translation> + </message> + <message> + <source>Add Resources</source> + <translation>Tilføj ressourcer</translation> + </message> + <message> + <source>Target Directory</source> + <translation>Målmappe</translation> + </message> + <message> + <source>Failed to Add File</source> + <translation>Kunne ikke tilføje fil</translation> + </message> + <message> + <source>Could not add %1 to project.</source> + <translation>Kunne ikke tilføje %1 til projekt.</translation> + </message> </context> <context> <name>QmlDesigner::NavigatorTreeModel</name> @@ -33453,6 +34268,14 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> <name>QmlDesigner::NavigatorWidget</name> <message> <source>Navigator</source> + <translation>Navigator</translation> + </message> + <message> + <source>Project</source> + <translation>Projekt</translation> + </message> + <message> + <source>Navigator</source> <comment>Title of navigator view</comment> <translation>Navigator</translation> </message> @@ -33591,7 +34414,7 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> </message> <message> <source>Build Adapter for the current Qt. Happens only once for every Qt installation.</source> - <translation>Byg adaptor for den aktuelle Qt. Sker kun én gang for hver Qt installation.</translation> + <translation>Byg adaptor for den nuværende Qt. Sker kun én gang for hver Qt installation.</translation> </message> <message> <source>Open error output file</source> @@ -33691,6 +34514,10 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> <translation>&Genskab standardvisning</translation> </message> <message> + <source>Toggle States</source> + <translation>Tilstande til/fra</translation> + </message> + <message> <source>Toggle &Left Sidebar</source> <translation>&Venstre sidebjælke til/fra</translation> </message> @@ -33761,6 +34588,10 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> <translation>Tilstande-redigering</translation> </message> <message> + <source>States</source> + <translation>Tilstande</translation> + </message> + <message> <source>base state</source> <translation>grundlæggende tilstand</translation> </message> @@ -33820,6 +34651,13 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> </message> </context> <context> + <name>QmlDesignerAddResources</name> + <message> + <source>Image Files</source> + <translation>Billedfiler</translation> + </message> +</context> +<context> <name>QmlDesignerContextMenu</name> <message> <source>Selection</source> @@ -34014,6 +34852,10 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> <translation>Nulstil placering og brug implicit placering.</translation> </message> <message> + <source>Fill selected item to parent.</source> + <translation>Udfyld valgte post til forælder.</translation> + </message> + <message> <source>Fill selected item to parent. </source> <translation>Udfyld valgte post til forælder. </translation> </message> @@ -34107,6 +34949,17 @@ Dette er uafhængigt af visibility-egenskaben i QML.</translation> </message> </context> <context> + <name>QmlJS Code Model Marks</name> + <message> + <source>Code Model Warning</source> + <translation>Kodemodel advarsel</translation> + </message> + <message> + <source>Code Model Error</source> + <translation>Kodemodel fejl</translation> + </message> +</context> +<context> <name>QmlJS::Bind</name> <message> <source>expected two numbers separated by a dot</source> @@ -34146,15 +34999,15 @@ For CMake projects, make sure QML_IMPORT_PATH variable is in CMakeCache.txt. Importstier: %2 -Til qmake-projekter, brug QML_IMPORT_PATH-variablen for at tilføj import stier. -Til Qbs-projekter, erklærer og sæt en qmlImportPaths-egenskab i dit produkt for at tilføje import stier. -Til qmlproject-projekter, brug importPaths-egenskaben for at tilføje import stier. +Til qmake-projekter, brug QML_IMPORT_PATH-variablen for at tilføj importstier. +Til Qbs-projekter, erklærer og sæt en qmlImportPaths-egenskab i dit produkt for at tilføje importstier. +Til qmlproject-projekter, brug importPaths-egenskaben for at tilføje importstier. Til CMake-projekter, sørg for at QML_IMPORT_PATH-variabler er i CMakeCache.txt. </translation> </message> <message> <source>QML module contains C++ plugins, currently reading type information...</source> - <translation>QML-modul indeholder C++-plugins, læser aktuelt typeinformation...</translation> + <translation>QML-modul indeholder C++-plugins, læser nuværende typeinformation...</translation> </message> </context> <context> @@ -34165,7 +35018,7 @@ Til CMake-projekter, sørg for at QML_IMPORT_PATH-variabler er i CMakeCache.txt. </message> <message> <source>Scanning QML Imports</source> - <translation>Skanner QML importer</translation> + <translation>Skanner QML-importer</translation> </message> </context> <context> @@ -35018,7 +35871,7 @@ Se "Checking Code Syntax"-dokumentation for mere information.</transla </message> <message> <source>Restrict to files contained in the current project</source> - <translation>Begræns til filer som er i det aktuelle projekt</translation> + <translation>Begræns til filer som er i det nuværende projekt</translation> </message> <message> <source>QML/JS Editing</source> @@ -35127,7 +35980,7 @@ QML-redigeringen skal kende til en sandsynlig URI.</translation> <name>QmlManager</name> <message> <source><Current File></source> - <translation><aktuel fil></translation> + <translation><nuværende fil></translation> </message> </context> <context> @@ -35774,7 +36627,7 @@ tager tid.</translation> session ends. This way multiple recording sessions can be aggregated in a single trace, for example if multiple QML engines start and stop sequentially during a single run of the program.</source> - <translation>Behandl kun data når processen som profileres slutter, ikke når den aktuelle optagelses- + <translation>Behandl kun data når processen som profileres slutter, ikke når den nuværende optagelses- session slutter. På denne måde kan flere optagelsessessioner samles til et enkelt spor, f.eks. hvis flere QML-motorer starter og stopper fortløbende under en enkel kørsel af programmet.</translation> @@ -35808,7 +36661,7 @@ tager tid.</translation> </message> <message> <source>Corrupt data before position %1.</source> - <translation>Ødelagt data før positon %1.</translation> + <translation>Ødelagt data før position %1.</translation> </message> </context> <context> @@ -35923,6 +36776,70 @@ tager tid.</translation> <translation>Hovedprogram</translation> </message> <message> + <source>Callee</source> + <translation>Modtager</translation> + </message> + <message> + <source>Callee Description</source> + <translation>Modtagerbeskrivelse</translation> + </message> + <message> + <source>Caller</source> + <translation>Kalder</translation> + </message> + <message> + <source>Caller Description</source> + <translation>Kalderbeskrivelse</translation> + </message> + <message> + <source>Calls</source> + <translation>Kald</translation> + </message> + <message> + <source>Details</source> + <translation>Detaljer</translation> + </message> + <message> + <source>Location</source> + <translation>Placering</translation> + </message> + <message> + <source>Longest Time</source> + <translation>Længste tid</translation> + </message> + <message> + <source>Mean Time</source> + <translation>Mean tid</translation> + </message> + <message> + <source>Self Time</source> + <translation>Egen tid</translation> + </message> + <message> + <source>Self Time in Percent</source> + <translation>Egen tid i procent</translation> + </message> + <message> + <source>Shortest Time</source> + <translation>Korteste tid</translation> + </message> + <message> + <source>Time in Percent</source> + <translation>Tid i procent</translation> + </message> + <message> + <source>Total Time</source> + <translation>Sammenlagt tid</translation> + </message> + <message> + <source>Type</source> + <translation>Type</translation> + </message> + <message> + <source>Median Time</source> + <translation>Median tid</translation> + </message> + <message> <source>+%1 in recursive calls</source> <translation>+%1 i rekursive kald</translation> </message> @@ -36086,7 +37003,7 @@ Vil du gemme dataene først?</translation> </message> <message> <source>Analyze Current Range</source> - <translation>Analysér aktuelt område</translation> + <translation>Analysér nuværende område</translation> </message> <message> <source>Analyze Full Range</source> @@ -36199,7 +37116,7 @@ Vil du gemme dataene først?</translation> </message> <message> <source>Mean Time</source> - <translation>Mean-tid</translation> + <translation>Mean tid</translation> </message> <message> <source>In Percent</source> @@ -36312,6 +37229,14 @@ Vil du gemme dataene først?</translation> <translation>QML Scene</translation> </message> <message> + <source>No qmlscene found.</source> + <translation>Ingen qmlscene fundet.</translation> + </message> + <message> + <source>No qmlscene binary specified for target device.</source> + <translation>Ingen qmlscene-binær specificeret for målenhed.</translation> + </message> + <message> <source>QML Viewer</source> <comment>QMLRunConfiguration display name.</comment> <translation>QML Viewer</translation> @@ -36915,7 +37840,7 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf </message> <message> <source><p>The project you are about to open is located in the write-protected location:</p><blockquote>%1</blockquote><p>Please select a writable location below and click "Copy Project and Open" to open a modifiable copy of the project or click "Keep Project and Open" to open the project in location.</p><p><b>Note:</b> You will not be able to alter or compile your project in the current location.</p></source> - <translation><p>Projektet du er ved at åbne er placeret i en skrivebeskyttet placering:</p><blockquote>%1</blockquote><p>Vælg venligst en skrivbar placering herunder og klik på "Kopiér projekt og åbn" for at åbne en redigerbar kopi af projektet eller klik på "Behold projekt og åbn" for at åbne projektet i placeringen.</p><p><b>Bemærk:</b> du vil ikke være i stand til at ændre eller kompilere dit projekt i den aktuelle placering.</p></translation> + <translation><p>Projektet du er ved at åbne er placeret i en skrivebeskyttet placering:</p><blockquote>%1</blockquote><p>Vælg venligst en skrivbar placering herunder og klik på "Kopiér projekt og åbn" for at åbne en redigerbar kopi af projektet eller klik på "Behold projekt og åbn" for at åbne projektet i placeringen.</p><p><b>Bemærk:</b> du vil ikke være i stand til at ændre eller kompilere dit projekt i den nuværende placering.</p></translation> </message> <message> <source>&Location:</source> @@ -37060,11 +37985,11 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf <name>QtSupport::Internal::QtSupportPlugin</name> <message> <source>Full path to the host bin directory of the current project's Qt version.</source> - <translation>Fuld sti til værtens bin-mappe af det aktuelle projekts Qt version.</translation> + <translation>Fuld sti til værtens bin-mappe af det nuværende projekts Qt version.</translation> </message> <message> <source>Full path to the target bin directory of the current project's Qt version.<br>You probably want %1 instead.</source> - <translation>Fuld sti til værtens mål-mappe af det aktuelle projekts Qt version.<br>Du vil formodentligt hellere have %1.</translation> + <translation>Fuld sti til værtens mål-mappe af det nuværende projekts Qt version.<br>Du vil formodentligt hellere have %1.</translation> </message> </context> <context> @@ -37119,75 +38044,79 @@ For flere detaljer, se /etc/sysctl.d/10-ptrace.conf </message> <message> <source>The version string of the current Qt version.</source> - <translation>Versionsstrengen af den aktuelle Qt version.</translation> + <translation>Versionsstrengen af den nuværende Qt version.</translation> </message> <message> <source>The type of the current Qt version.</source> - <translation>Typen af den aktuelle Qt version.</translation> + <translation>Typen af den nuværende Qt version.</translation> </message> <message> <source>The mkspec of the current Qt version.</source> - <translation>mkspec'en af den aktuelle Qt version.</translation> + <translation>mkspec'en af den nuværende Qt version.</translation> </message> <message> <source>The installation prefix of the current Qt version.</source> - <translation>Installationspræfikset af den aktuelle Qt version.</translation> + <translation>Installationspræfikset af den nuværende Qt version.</translation> </message> <message> <source>The installation location of the current Qt version's data.</source> - <translation>Installationens placering af den aktuelle Qt versions data.</translation> + <translation>Installationens placering af den nuværende Qt versions data.</translation> </message> <message> <source>The installation location of the current Qt version's header files.</source> - <translation>Installationens placering af den aktuelle Qt versions headerfiler.</translation> + <translation>Installationens placering af den nuværende Qt versions headerfiler.</translation> </message> <message> <source>The installation location of the current Qt version's library files.</source> - <translation>Installationens placering af den aktuelle Qt versions biblioteksfiler.</translation> + <translation>Installationens placering af den nuværende Qt versions biblioteksfiler.</translation> </message> <message> <source>The installation location of the current Qt version's documentation files.</source> - <translation>Installationens placering af den aktuelle Qt versions dokumentationsfiler.</translation> + <translation>Installationens placering af den nuværende Qt versions dokumentationsfiler.</translation> </message> <message> <source>The installation location of the current Qt version's executable files.</source> - <translation>Installationens placering af den aktuelle Qt versions eksekverbare filer.</translation> + <translation>Installationens placering af den nuværende Qt versions eksekverbare filer.</translation> </message> <message> <source>The installation location of the current Qt version's plugins.</source> - <translation>Installationens placering af den aktuelle Qt versions plugins.</translation> + <translation>Installationens placering af den nuværende Qt versions plugins.</translation> + </message> + <message> + <source>The installation location of the current Qt version's QML files.</source> + <translation>Installationens placering af den nuværende Qt versions QML-filer.</translation> </message> <message> <source>The installation location of the current Qt version's imports.</source> - <translation>Installationens placering af den aktuelle Qt versions imports.</translation> + <translation>Installationens placering af den nuværende Qt versions importer.</translation> </message> <message> <source>The installation location of the current Qt version's translation files.</source> - <translation>Installationens placering af den aktuelle Qt versions oversættelsesfiler.</translation> + <translation>Installationens placering af den nuværende Qt versions oversættelsesfiler.</translation> </message> <message> <source>The installation location of the current Qt version's examples.</source> - <translation>Installationens placering af den aktuelle Qt versions eksempler.</translation> + <translation>Installationens placering af den nuværende Qt versions eksempler.</translation> </message> <message> <source>The installation location of the current Qt version's demos.</source> - <translation>Installationens placering af den aktuelle Qt versions demoer.</translation> + <translation>Installationens placering af den nuværende Qt versions demoer.</translation> </message> <message> <source>The current Qt version's default mkspecs (Qt 4).</source> - <translation>Den aktuelle Qt version's standard mkspecs (Qt 4).</translation> + <translation>Den nuværende Qt version's standard mkspecs (Qt 4).</translation> </message> <message> <source>The current Qt version's default mkspec (Qt 5; host system).</source> - <translation>Den aktuelle Qt version's standard mkspec (Qt 5; værtssystem).</translation> + <translation>Den nuværende Qt version's standard mkspec (Qt 5; værtssystem).</translation> </message> <message> <source>The current Qt version's default mkspec (Qt 5; target system).</source> - <translation>Den aktuelle Qt version's standard mkspec (Qt 5; målsystem).</translation> + <translation>Den nuværende Qt version's standard mkspec (Qt 5; målsystem).</translation> </message> <message> <source>The current Qt's qmake version.</source> - <translation>Den aktuelle Qt's qmake version.</translation> + <translation>Den nuværende Qt's qmake version.</translation> </message> <message> <source>None</source> @@ -37746,7 +38675,7 @@ Derudover testes enhedens forbindelse.</translation> </message> <message> <source>The following specified ports are currently in use: %1</source> - <translation>Følgende porte er aktuelt i brug: %1</translation> + <translation>Følgende porte er nuværende i brug: %1</translation> </message> </context> <context> @@ -37926,6 +38855,10 @@ Derudover testes enhedens forbindelse.</translation> <source>(on Remote Generic Linux Host)</source> <translation>(på fjern-generisk Linux-vært)</translation> </message> + <message> + <source>%1 (on Remote Generic Linux Host)</source> + <translation>%1 (på fjern-generisk Linux-vært)</translation> + </message> </context> <context> <name>RemoteLinux::Internal::TypeSpecificDeviceConfigurationListModel</name> @@ -38062,6 +38995,28 @@ Derudover testes enhedens forbindelse.</translation> </message> </context> <context> + <name>RemoteLinux::RemoteLinuxKillAppService</name> + <message> + <source>Trying to kill "%1" on remote device...</source> + <translation>Prøver at dræbe "%1" på fjern-enhed...</translation> + </message> + <message> + <source>Remote application killed.</source> + <translation>Fjern-program dræbt.</translation> + </message> + <message> + <source>Failed to kill remote application. Assuming it was not running.</source> + <translation>Kunne ikke dræbe fjern-program. Formoder at det ikke kørte.</translation> + </message> +</context> +<context> + <name>RemoteLinux::RemoteLinuxKillAppStep</name> + <message> + <source>Kill current application instance</source> + <translation>Dræb nuværende programinstans</translation> + </message> +</context> +<context> <name>RemoteLinux::RemoteLinuxPerfSupport</name> <message> <source>FIFO for profiling data could not be created.</source> @@ -39266,7 +40221,7 @@ Række: %4, Kolonne: %5 </message> <message> <source>Current tag is not selected.</source> - <translation>Aktuelle tag er ikke valgt.</translation> + <translation>Nuværende tag er ikke valgt.</translation> </message> <message> <source>Pasted data is empty.</source> @@ -39461,7 +40416,7 @@ Række: %4, Kolonne: %5 </message> <message> <source>Current value of the Slider. The default value is 0.0.</source> - <translation>Skyderens aktuelle værdi. Standardværdien er 0.0.</translation> + <translation>Skyderens nuværende værdi. Standardværdien er 0.0.</translation> </message> <message> <source>Maximum value</source> @@ -39517,7 +40472,7 @@ Række: %4, Kolonne: %5 </message> <message> <source>Determines whether the current value should be updated while the user is moving the slider handle, or only when the button has been released.</source> - <translation>Beslutter om den aktuelle værdi skal opdateres mens brugeren flytter skyderens håndtag eller kun når knappen slippes.</translation> + <translation>Beslutter om den nuværende værdi skal opdateres mens brugeren flytter skyderens håndtag eller kun når knappen slippes.</translation> </message> </context> <context> @@ -39614,6 +40569,14 @@ med en adgangskode, som du kan indtaste herunder.</translation> <source>Specifies how the font size of the displayed text is determined.</source> <translation>Specificerer hvordan skiftstørrelsen af den viste tekst besluttes.</translation> </message> + <message> + <source>Line height</source> + <translation>Linjehøjde</translation> + </message> + <message> + <source>Sets the line height for the text.</source> + <translation>Sætter linjehøjden for teksten.</translation> + </message> </context> <context> <name>StatesDelegate</name> @@ -39732,7 +40695,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> </message> <message> <source>Diff Current File</source> - <translation>Diff aktuel fil</translation> + <translation>Diff nuværende fil</translation> </message> <message> <source>Diff "%1"</source> @@ -39748,7 +40711,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> </message> <message> <source>Filelog Current File</source> - <translation>Filelog aktuel fil</translation> + <translation>Filelog nuværende fil</translation> </message> <message> <source>Filelog "%1"</source> @@ -39756,7 +40719,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> </message> <message> <source>Annotate Current File</source> - <translation>Annotate aktuel fil</translation> + <translation>Annotate nuværende fil</translation> </message> <message> <source>Annotate "%1"</source> @@ -39780,7 +40743,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> </message> <message> <source>Commit Current File</source> - <translation>Commit aktuel fil</translation> + <translation>Commit nuværende fil</translation> </message> <message> <source>Commit "%1"</source> @@ -39958,7 +40921,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> </message> <message> <source>Current index</source> - <translation>Aktuelt indeks</translation> + <translation>Nuværende indeks</translation> </message> <message> <source>Frame visible</source> @@ -40058,6 +41021,10 @@ med en adgangskode, som du kan indtaste herunder.</translation> <translation>Fjern ikke</translation> </message> <message> + <source>Disable Kit "%1" in This Project?</source> + <translation>Deaktivér kittet "%1" i dette projekt?</translation> + </message> + <message> <source>Disable Kit %1 in This Project?</source> <translation>Deaktivér kittet %1 i dette projekt?</translation> </message> @@ -40286,7 +41253,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> <name>TextEditor::CodeStyleEditor</name> <message> <source>Edit preview contents to see how the current settings are applied to custom code snippets. Changes in the preview do not affect the current settings.</source> - <translation>Rediger forhåndsvisningens indhold for at se hvordan de aktuelle indstillinger anvendes på brugerdefineret kode-snippets. Ændringer i forhåndsvisningen påvirker ikke de aktuelle indstillinger.</translation> + <translation>Rediger forhåndsvisningens indhold for at se hvordan de nuværende indstillinger anvendes på brugerdefineret kode-snippets. Ændringer i forhåndsvisningen påvirker ikke de nuværende indstillinger.</translation> </message> </context> <context> @@ -40680,7 +41647,7 @@ Specificerer hvordan backspace interagerer med indrykgning. <p>This setting does <b>not</b> influence the use of UTF-16 and UTF-32 BOMs.</p></body></html></source> <translation><html><head/><body> <p>Hvordan tekstredigeringer skal tage sig af UTF-8 Byte Order Marks. Valgmulighederne er:</p> -<ul ><li><i>Tilføj, hvis kodning er UTF-8:</i> tilføj altid et BOM når en fil gemmes i UTF-8-kodning. Bemærk at dette ikke vil virke hvis kodningen er <i>System</i>, eftersom tekstredigeringen ikke ved hvad den rent faktisk er.</li> +<ul ><li><i>Tilføj, hvis kodning er UTF-8:</i> tilføj altid et BOM når en fil gemmes i UTF-8-kodning. Bemærk at dette ikke vil virke hvis kodningen er <i>System</i>, eftersom tekstredigeringen ikke ved hvad den rent faktisk er.</li> <li><i>Behold, hvis allerede tilstede: </i>gem filen med et BOM hvis den allerede havde et da den blev indlæst.</li> <li><i>Slet altid:</i> skriv aldrig et UTF-8 BOM, hvilket muligvis sletter et der findes i forvejen.</li></ul> <p>Bemærk at UTF-8 BOM'er er ualmindelige og behandles ukorrekt af nogle redigeringer, så det giver faktisk ikke så meget mening at tilføje det.</p> @@ -40718,7 +41685,7 @@ Specificerer hvordan backspace interagerer med indrykgning. </message> <message> <source>Current settings:</source> - <translation>Aktuelle indstillinger:</translation> + <translation>Nuværende indstillinger:</translation> </message> <message> <source>Copy...</source> @@ -41053,7 +42020,7 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt </message> <message> <source>Highlight current &line</source> - <translation>Fremhæv aktuel &linje</translation> + <translation>Fremhæv nuværende &linje</translation> </message> <message> <source>Display line &numbers</source> @@ -41107,12 +42074,20 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt <source>Aligned at right side</source> <translation>Justeret til højre side</translation> </message> + <message> + <source>Line annotations</source> + <translation>Linjeannotationer</translation> + </message> + <message> + <source>Between lines</source> + <translation>Mellem linjer</translation> + </message> </context> <context> <name>TextEditor::Internal::FindInCurrentFile</name> <message> <source>Current File</source> - <translation>Aktuel fil</translation> + <translation>Nuværende fil</translation> </message> <message> <source>File "%1":</source> @@ -41225,7 +42200,7 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt <name>TextEditor::Internal::LineNumberFilter</name> <message> <source>Line in Current Document</source> - <translation>Linje i aktuelt dokument</translation> + <translation>Linje i nuværende dokument</translation> </message> <message> <source>Line %1, Column %2</source> @@ -41337,6 +42312,79 @@ Derudover indsætter Skift+Enter et undvigetegn ved markørens placering og flyt </message> </context> <context> + <name>TextEditor::Internal::Snippets</name> + <message> + <source></source> + <comment>Snippets are text fragments that can be inserted into an editor via the usual completion mechanics using a trigger text. The translated text (trigger variant) is used to disambiguate between snippets with the same trigger.</comment> + <translation></translation> + </message> + <message> + <source>derived from QObject</source> + <comment>group:'C++' trigger:'class'</comment> + <translation>afledt fra QObject</translation> + </message> + <message> + <source>derived from QWidget</source> + <comment>group:'C++' trigger:'class'</comment> + <translation>afledt fra QWidget</translation> + </message> + <message> + <source>template</source> + <comment>group:'C++' trigger:'class'</comment> + <translation>skabelon</translation> + </message> + <message> + <source>with if</source> + <comment>group:'C++' trigger:'else'</comment> + <translation>med if</translation> + </message> + <message> + <source>and else</source> + <comment>group:'C++' trigger:'if'</comment> + <translation>og else</translation> + </message> + <message> + <source>and catch</source> + <comment>group:'C++' trigger:'try'</comment> + <translation>og catch</translation> + </message> + <message> + <source>namespace</source> + <comment>group:'C++' trigger:'using'</comment> + <translation>navnerum</translation> + </message> + <message> + <source>template</source> + <comment>group:'C++' trigger:'struct'</comment> + <translation>skabelon</translation> + </message> + <message> + <source>with targets</source> + <comment>group:'QML' trigger:'NumberAnimation'</comment> + <translation>med mål</translation> + </message> + <message> + <source>with target</source> + <comment>group:'QML' trigger:'NumberAnimation'</comment> + <translation>med mål</translation> + </message> + <message> + <source>with targets</source> + <comment>group:'QML' trigger:'PropertyAction'</comment> + <translation>med mål</translation> + </message> + <message> + <source>with target</source> + <comment>group:'QML' trigger:'PropertyAction'</comment> + <translation>med mål</translation> + </message> + <message> + <source>example</source> + <comment>group:'Text' trigger:'global'</comment> + <translation>eksempel</translation> + </message> +</context> +<context> <name>TextEditor::Internal::SnippetsCollection</name> <message> <source>Cannot create user snippet directory %1</source> @@ -41476,7 +42524,7 @@ Influences the indentation of continuation lines. Påvirker indrykningen af fortsatte linjer. <ul> -<li>Slet ikke: juster slet ikke. Linjer indrykkes kun til den aktuelle logiske indrykningsdybde. +<li>Slet ikke: juster slet ikke. Linjer indrykkes kun til den nuværende logiske indrykningsdybde. <pre> (tab)int i = foo(a, b (tab)c, d); @@ -41623,7 +42671,7 @@ Påvirker indrykningen af fortsatte linjer. </message> <message> <source>Insert Line Above Current Line</source> - <translation>Indsæt linje over aktuel linje</translation> + <translation>Indsæt linje over nuværende linje</translation> </message> <message> <source>Ctrl+Shift+Return</source> @@ -41631,7 +42679,7 @@ Påvirker indrykningen af fortsatte linjer. </message> <message> <source>Insert Line Below Current Line</source> - <translation>Indsæt linje under aktuel linje</translation> + <translation>Indsæt linje under nuværende linje</translation> </message> <message> <source>Ctrl+Return</source> @@ -41918,6 +42966,14 @@ Påvirker indrykningen af fortsatte linjer. <translation>Vælg ord under markør</translation> </message> <message> + <source>Go to Document Start</source> + <translation>Gå til dokumentets begyndelse</translation> + </message> + <message> + <source>Go to Document End</source> + <translation>Gå til dokumentets slutning</translation> + </message> + <message> <source>Go to Line Start</source> <translation>Gå til linjens begyndelse</translation> </message> @@ -42031,27 +43087,27 @@ Påvirker indrykningen af fortsatte linjer. </message> <message> <source>Selected text within the current document.</source> - <translation>Markeret tekst inden i det aktuelle dokument.</translation> + <translation>Markeret tekst inden i det nuværende dokument.</translation> </message> <message> <source>Line number of the text cursor position in current document (starts with 1).</source> - <translation>Linjenummer af tekst-markørens placering i aktuelt dokument (starter med 1).</translation> + <translation>Linjenummer af tekst-markørens placering i nuværende dokument (starter med 1).</translation> </message> <message> <source>Column number of the text cursor position in current document (starts with 0).</source> - <translation>Kolonnenummer af tekst-markørens placering i aktuelt dokument (starter med 0).</translation> + <translation>Kolonnenummer af tekst-markørens placering i nuværende dokument (starter med 0).</translation> </message> <message> <source>Number of lines visible in current document.</source> - <translation>Antal synlige linjer i aktuelt dokument.</translation> + <translation>Antal synlige linjer i nuværende dokument.</translation> </message> <message> <source>Number of columns visible in current document.</source> - <translation>Antal synlige kolonner i aktuelt dokument.</translation> + <translation>Antal synlige kolonner i nuværende dokument.</translation> </message> <message> <source>Current document's font size in points.</source> - <translation>Aktuelt dokuments skriftstørrelse i punkter.</translation> + <translation>Nuværende dokuments skriftstørrelse i punkter.</translation> </message> </context> <context> @@ -42070,11 +43126,11 @@ Påvirker indrykningen af fortsatte linjer. </message> <message> <source>Convert to Stack Variable</source> - <translation>Konverter til stak-variabel</translation> + <translation>Konvertér til stak-variabel</translation> </message> <message> <source>Convert to Pointer</source> - <translation>Konverter til pointer</translation> + <translation>Konvertér til pointer</translation> </message> <message> <source>Generate Missing Q_PROPERTY Members</source> @@ -42091,6 +43147,10 @@ Påvirker indrykningen af fortsatte linjer. <context> <name>TextEditor::TextDocument</name> <message> + <source>Diff Against Current File</source> + <translation>Diff mod nuværende fil</translation> + </message> + <message> <source>Opening File</source> <translation>Åbner fil</translation> </message> @@ -42180,7 +43240,7 @@ Anvendt på tekst, hvis ingen andre regler matcher.</translation> </message> <message> <source>Current Line</source> - <translation>Aktuel linje</translation> + <translation>Nuværende linje</translation> </message> <message> <source>Line where the cursor is placed in.</source> @@ -42188,7 +43248,7 @@ Anvendt på tekst, hvis ingen andre regler matcher.</translation> </message> <message> <source>Current Line Number</source> - <translation>Aktuelt linjenummer</translation> + <translation>Nuværende linjenummer</translation> </message> <message> <source>Line number located on the left side of the editor where the cursor is placed in.</source> @@ -42484,7 +43544,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> <message> <source>Compared files (in diff editor).</source> - <translation>Sammenlignte filer (i diff-redigering).</translation> + <translation>Sammenlignede filer (i diff-redigering).</translation> </message> <message> <source>Diff Location</source> @@ -42583,6 +43643,22 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <translation>Understregningsfarve til konteksten af advarselsdiagnostik.</translation> </message> <message> + <source>Function Declaration</source> + <translation>Funktionserklæring</translation> + </message> + <message> + <source>Style adjustments to (function) declarations.</source> + <translation>Stiljusteringer til (funktion) deklarationer.</translation> + </message> + <message> + <source>Function Definition</source> + <translation>Funktionsdefinition</translation> + </message> + <message> + <source>Name of function at its definition.</source> + <translation>Navn på funktion ved dens definition.</translation> + </message> + <message> <source>Declaration</source> <translation>Deklaration</translation> </message> @@ -42869,11 +43945,11 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> <message> <source>Scan only the currently edited document</source> - <translation>Skan kun det aktuelt redigeret dokument</translation> + <translation>Skan kun det nuværende redigeret dokument</translation> </message> <message> <source>Scan the current subproject</source> - <translation>Skan det aktuelle underprojekt</translation> + <translation>Skan det nuværende underprojekt</translation> </message> </context> <context> @@ -42906,11 +43982,11 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> <message> <source>Current Document</source> - <translation>Aktuelt dokument</translation> + <translation>Nuværende dokument</translation> </message> <message> <source>Scan only the currently edited document.</source> - <translation>Skan kun det aktuelt redigeret dokument.</translation> + <translation>Skan kun det nuværende redigeret dokument.</translation> </message> <message> <source>Active Project</source> @@ -42926,7 +44002,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> <message> <source>Scan the current subproject.</source> - <translation>Skan det aktuelle underprojekt.</translation> + <translation>Skan det nuværende underprojekt.</translation> </message> <message> <source>Show "%1" entries</source> @@ -43288,6 +44364,17 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> </context> <context> + <name>Utils::EnvironmentIdAccessor</name> + <message> + <source><p>No .user settings file created by this instance of %1 was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%2"?</p></source> + <translation><p>Fandt ingen .user-indstillingsfil oprettet af denne instans af %1.</p><p>Arbejdede du tidligere med dette projekt på anden maskine eller brugte en anden indstillingssti?</p><p>Vil du stadig indlæse indstillingsfilen "%2"?</p></translation> + </message> + <message> + <source>Settings File for "%1" from a Different Environment?</source> + <translation>Indstillingsfil for "%1" fra et andet miljø?</translation> + </message> +</context> +<context> <name>Utils::EnvironmentModel</name> <message> <source><UNSET></source> @@ -43771,6 +44858,25 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> </context> <context> + <name>Utils::RemoveFileDialog</name> + <message> + <source>Remove File</source> + <translation>Fjern fil</translation> + </message> + <message> + <source>File to remove:</source> + <translation>Fil som skal fjernes:</translation> + </message> + <message> + <source>&Delete file permanently</source> + <translation>&Slet fil permanent</translation> + </message> + <message> + <source>&Remove from version control</source> + <translation>&Fjern fra versionsstyring</translation> + </message> +</context> +<context> <name>Utils::SaveFile</name> <message> <source>File might be locked.</source> @@ -43780,6 +44886,22 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <context> <name>Utils::SettingsAccessor</name> <message> + <source>Failed to Read File</source> + <translation>Kunne ikke læse fil</translation> + </message> + <message> + <source>Could not open "%1".</source> + <translation>Kunne ikke åbne "%1".</translation> + </message> + <message> + <source>Failed to Write File</source> + <translation>Kunne ikke skrive fil</translation> + </message> + <message> + <source>There was nothing to write.</source> + <translation>Der var intet at skrive.</translation> + </message> + <message> <source>No Valid Settings Found</source> <translation>Ingen gyldige indstillinger fundet</translation> </message> @@ -43796,6 +44918,14 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <translation><p>Den versionificeret backup "%1" af indstillingsfilen bruges, fordi den ikke-versionificeret fil blev oprettet af en inkompatibel version af %2.</p><p>Ændringer i indstillingerne foretaget siden den sidste gange denne version af %2 blev brugt ignoreres og ændringer foretaget nu vil <b>ikke</b> blive propageret til den nye version.</p></translation> </message> <message> + <source>Unsupported Shared Settings File</source> + <translation>Ikke-understøttede delt indstillingsfil</translation> + </message> + <message> + <source>The version of your .shared file is not supported by %1. Do you want to try loading it anyway?</source> + <translation>Versionen af din .shared-fil understøttes ikke af %1. Vil du prøve at indlæse den alligevel?</translation> + </message> + <message> <source><p>The versioned backup "%1" of the settings file is used, because the non-versioned file was created by an incompatible version of Qt Creator.</p><p>Settings changes made since the last time this version of Qt Creator was used are ignored, and changes made now will <b>not</b> be propagated to the newer version.</p></source> <translation><p>Den versionificeret backup "%1" af indstillingsfilen bruges, fordi den ikke-versionificeret fil blev oprettet af en inkompatibel version af Qt Creator.</p><p>Ændringer i indstillingerne foretaget siden den sidste gange denne version af Qt Creator blev brugt ignoreres og ændringer foretaget nu vil <b>ikke</b> blive propageret til den nye version.</p></translation> </message> @@ -43915,7 +45045,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> <name>Utils::UnixTools</name> <message> <source><table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table></source> - <translation><table border=1 cellspacing=0 cellpadding=3><tr><th>Variabel</th><th>Udfolder til</th></tr><tr><td>%d</td><td>mappe af aktuel fil</td></tr><tr><td>%f</td><td>filnavn (med fuld sti)</td></tr><tr><td>%n</td><td>filnavn (uden sti)</td></tr><tr><td>%%</td><td>%</td></tr></table></translation> + <translation><table border=1 cellspacing=0 cellpadding=3><tr><th>Variabel</th><th>Udfolder til</th></tr><tr><td>%d</td><td>mappe af nuværende fil</td></tr><tr><td>%f</td><td>filnavn (med fuld sti)</td></tr><tr><td>%n</td><td>filnavn (uden sti)</td></tr><tr><td>%%</td><td>%</td></tr></table></translation> </message> </context> <context> @@ -44514,6 +45644,184 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> </context> <context> + <name>Valgrind::Internal::HeobData</name> + <message> + <source>Process %1</source> + <translation>Proces %1</translation> + </message> + <message> + <source>Process finished with exit code %1 (0x%2).</source> + <translation>Proces afsluttede med afslutningskode %1 (0x%2).</translation> + </message> + <message> + <source>Unknown argument: -%1</source> + <translation>Ukendt argument: -%1</translation> + </message> + <message> + <source>Cannot create target process.</source> + <translation>Kan ikke oprette målproces.</translation> + </message> + <message> + <source>Wrong bitness.</source> + <translation>Forkert bitness.</translation> + </message> + <message> + <source>Process killed.</source> + <translation>Proces dræbt.</translation> + </message> + <message> + <source>Only works with dynamically linked CRT.</source> + <translation>Virker kun med dynamisk linket CRT.</translation> + </message> + <message> + <source>Process stopped with unhandled exception code 0x%1.</source> + <translation>Processen stoppede med uhåndteret undtagelseskode 0x%1.</translation> + </message> + <message> + <source>Not enough memory to keep track of allocations.</source> + <translation>Ikke nok hukommelse til at holde styr på allokeringer.</translation> + </message> + <message> + <source>Application stopped unexpectedly.</source> + <translation>Programmet stoppede uventet.</translation> + </message> + <message> + <source>Extra console.</source> + <translation>Ekstra konsol.</translation> + </message> + <message> + <source>Unknown exit reason.</source> + <translation>Ukendt afslutningsårsag.</translation> + </message> + <message> + <source>Heob stopped unexpectedly.</source> + <translation>Heob stoppede uventet.</translation> + </message> + <message> + <source>Heob: %1</source> + <translation>Heob: %1</translation> + </message> + <message> + <source>Heob: Failure in process attach handshake (%1).</source> + <translation>Heob: fejl i processens tilkoblingshåndtryk (%1).</translation> + </message> +</context> +<context> + <name>Valgrind::Internal::HeobDialog</name> + <message> + <source>XML output file:</source> + <translation>XML-output-fil:</translation> + </message> + <message> + <source>Handle exceptions:</source> + <translation>Håndter undtagelser:</translation> + </message> + <message> + <source>Off</source> + <translation>Fra</translation> + </message> + <message> + <source>On</source> + <translation>Til</translation> + </message> + <message> + <source>Only</source> + <translation>Kun</translation> + </message> + <message> + <source>Page protection:</source> + <translation>Sidebeskyttelse:</translation> + </message> + <message> + <source>After</source> + <translation>Efter</translation> + </message> + <message> + <source>Before</source> + <translation>Før</translation> + </message> + <message> + <source>Freed memory protection</source> + <translation>Frigivet hukommelsesbeskyttelse</translation> + </message> + <message> + <source>Raise breakpoint exception on error</source> + <translation>Løft brudpunktundtagelse ved fejl</translation> + </message> + <message> + <source>Leak details:</source> + <translation>Lækagedetaljer:</translation> + </message> + <message> + <source>None</source> + <translation>Ingen</translation> + </message> + <message> + <source>Simple</source> + <translation>Simpel</translation> + </message> + <message> + <source>Detect Leak Types</source> + <translation>Detekter lækagetyper</translation> + </message> + <message> + <source>Detect Leak Types (Show Reachable)</source> + <translation>Detekter lækagetyper (vis som kan tilgås)</translation> + </message> + <message> + <source>Fuzzy Detect Leak Types</source> + <translation>Uafklaret detekter lækagetyper</translation> + </message> + <message> + <source>Fuzzy Detect Leak Types (Show Reachable)</source> + <translation>Uafklaret detekter lækagetyper (vis som kan tilgås)</translation> + </message> + <message> + <source>Minimum leak size:</source> + <translation>Minimum lækagestørrelse:</translation> + </message> + <message> + <source>Control leak recording:</source> + <translation>Styr lækageoptagelse:</translation> + </message> + <message> + <source>On (Start Disabled)</source> + <translation>Til (start deaktiveret)</translation> + </message> + <message> + <source>On (Start Enabled)</source> + <translation>Til (start aktiveret)</translation> + </message> + <message> + <source>Run with debugger</source> + <translation>Kør med fejlretter</translation> + </message> + <message> + <source>Extra arguments:</source> + <translation>Ekstra argumenter:</translation> + </message> + <message> + <source>Heob path:</source> + <translation>Heob-sti:</translation> + </message> + <message> + <source>The location of heob32.exe and heob64.exe.</source> + <translation>Placeringen af heob32.exe og heob64.exe.</translation> + </message> + <message> + <source>Save current settings as default.</source> + <translation>Gem nuværende indstillinger som standard.</translation> + </message> + <message> + <source>OK</source> + <translation>OK</translation> + </message> + <message> + <source>Heob</source> + <translation>Heob</translation> + </message> +</context> +<context> <name>Valgrind::Internal::MemcheckErrorView</name> <message> <source>Suppress Error</source> @@ -44528,7 +45836,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge.</translation> </message> <message> <source>Show issues originating outside currently opened projects.</source> - <translation>Vis problemer som stammer udenfor de aktuelle åbnede projekter.</translation> + <translation>Vis problemer som stammer udenfor de nuværende åbnede projekter.</translation> </message> <message> <source>Suppressions</source> @@ -44597,10 +45905,46 @@ When a problem is detected, the application is interrupted and can be debugged.< Når et problem detekteres, afbrydes programmet og kan fejlrettes.</translation> </message> <message> + <source>Heob</source> + <translation>Heob</translation> + </message> + <message> + <source>Ctrl+Alt+H</source> + <translation>Ctrl+Alt+H</translation> + </message> + <message> <source>Valgrind Memory Analyzer (External Application)</source> <translation>Valgrind hukommelsesanalysator (eksternt program)</translation> </message> <message> + <source>Heob: No local run configuration available.</source> + <translation>Heob: ingen lokal kør-konfiguration tilgængelig.</translation> + </message> + <message> + <source>Heob: No toolchain available.</source> + <translation>Heob: ingen værktøjskæde tilgængelig.</translation> + </message> + <message> + <source>Heob: No executable set.</source> + <translation>Heob: ingen eksekverbar sat.</translation> + </message> + <message> + <source>Heob: Cannot find %1.</source> + <translation>Heob: kan ikke finde %1.</translation> + </message> + <message> + <source>The %1 executables must be in the appropriate location.</source> + <translation>%1-eksekverbarene skal være på den passende placering.</translation> + </message> + <message> + <source>Heob used with MinGW projects needs the %1 DLLs for proper stacktrace resolution.</source> + <translation>Heob brugt med MinGW-projekter behøver %1-DLL'erne for at få ordentlig stacktrace-opløsning.</translation> + </message> + <message> + <source>Heob: Cannot create %1 process (%2).</source> + <translation>Heob: kan ikke oprette %1-proces (%2).</translation> + </message> + <message> <source>A Valgrind Memcheck analysis is still in progress.</source> <translation>En Valgrind Memcheck-analyse er stadig i gang.</translation> </message> @@ -44629,6 +45973,20 @@ Når et problem detekteres, afbrydes programmet og kan fejlrettes.</translation> <translation>Memcheck: der opstod en fejl ved parsing af Valgrind-output: %1</translation> </message> <message numerus="yes"> + <source>Memory Analyzer Tool finished. %n issues were found.</source> + <translation> + <numerusform>Hukommelsesanalysator-værktøj afsluttede. %n problem blev fundet.</numerusform> + <numerusform>Hukommelsesanalysator-værktøj afsluttede. %n problemer blev fundet.</numerusform> + </translation> + </message> + <message numerus="yes"> + <source>Log file processed. %n issues were found.</source> + <translation> + <numerusform>Logfil behandlet. %n problem blev fundet.</numerusform> + <numerusform>Logfil behandlet. %n problemer blev fundet.</numerusform> + </translation> + </message> + <message numerus="yes"> <source>Memory Analyzer Tool finished, %n issues were found.</source> <translation> <numerusform>Hukommelsesanalysator-værktøj afsluttede, %n problem blev fundet.</numerusform> @@ -44797,7 +46155,7 @@ Med mellemlager-simulation aktiveres begivenhedstællere: </message> <message> <source>Show reachable and indirectly lost blocks</source> - <translation>Vis blokke som ikke kan tilgås og indirekte tabte</translation> + <translation>Vis blokke som kan tilgås og indirekte tabte</translation> </message> <message> <source>Check for leaks on finish:</source> @@ -44951,7 +46309,7 @@ Med mellemlager-simulation aktiveres begivenhedstællere: </message> <message> <source>trying to read element text although current position is not start of element</source> - <translation>prøver at læse elementets tekst selvom aktuelle placering ikke er begyndelsen på elementet</translation> + <translation>prøver at læse elementets tekst selvom nuværende placering ikke er begyndelsen på elementet</translation> </message> <message> <source>Unexpected child element while reading element text</source> @@ -45239,11 +46597,11 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o <name>VcsBase::Internal::VcsPlugin</name> <message> <source>Name of the version control system in use by the current project.</source> - <translation>Navn på versionsstyringssystemet i brug af det aktuelle projekt.</translation> + <translation>Navn på versionsstyringssystemet i brug af det nuværende projekt.</translation> </message> <message> <source>The current version control topic (branch or tag) identification of the current project.</source> - <translation>Det aktuelle versionsstyrings emne (gren eller tag) identifikation af det aktuelle projekt.</translation> + <translation>Det nuværende versionsstyrings emne (gren eller tag) identifikation af det nuværende projekt.</translation> </message> <message> <source>The top level path to the repository the current project is in.</source> @@ -45472,7 +46830,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o </message> <message> <source>Version control "%1" does not support initial checkouts.</source> - <translation>Versionsstyring "%1" undersøtter ikke indledende checkouts.</translation> + <translation>Versionsstyring "%1" understøtter ikke indledende checkouts.</translation> </message> <message> <source>"%1" is empty when trying to run checkout.</source> @@ -45623,7 +46981,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o </message> <message> <source>Cannot create an appropriate run control for the current run configuration.</source> - <translation>Kan ikke oprette en passende kør-styring til den aktuelle kør-konfiguration.</translation> + <translation>Kan ikke oprette en passende kør-styring til den nuværende kør-konfiguration.</translation> </message> </context> <context> @@ -45774,7 +47132,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o <name>WinRt::Internal::WinRtRunnerHelper</name> <message> <source>The current kit has no Qt version.</source> - <translation>Det aktuelle kit har ingen Qt version.</translation> + <translation>Det nuværende kit har ingen Qt version.</translation> </message> <message> <source>Cannot find winrtrunner.exe in "%1".</source> @@ -45910,6 +47268,10 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o <translation>Drop element</translation> </message> <message> + <source>Add Related Element</source> + <translation>Tilføj relateret element</translation> + </message> + <message> <source>Add Element</source> <translation>Tilføj element</translation> </message> @@ -46092,6 +47454,10 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o <source>Same Size</source> <translation>Samme størrelse</translation> </message> + <message> + <source>Add Related Elements</source> + <translation>Tilføj relaterede elementer</translation> + </message> </context> <context> <name>qmt::ProjectController</name> @@ -46327,6 +47693,10 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o <translation>Omrids</translation> </message> <message> + <source>Flat</source> + <translation>Flad</translation> + </message> + <message> <source>Emphasized</source> <translation>Fremhævet</translation> </message> @@ -46423,6 +47793,10 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o <translation>Svømmebaner</translation> </message> <message> + <source>Invalid syntax.</source> + <translation>Ugyldig syntaks.</translation> + </message> + <message> <source><font color=red>Invalid syntax.</font></source> <translation><font color=red>Ugyldig syntaks.</font></translation> </message> diff --git a/src/libs/tracing/flamegraph.cpp b/src/libs/tracing/flamegraph.cpp index 9d7df037f5..0e454cdbb7 100644 --- a/src/libs/tracing/flamegraph.cpp +++ b/src/libs/tracing/flamegraph.cpp @@ -185,11 +185,13 @@ void FlameGraph::rebuild() return; } - if (m_root.isValid()) { - QObject *parentObject = appendChild(this, this, qmlContext(this), m_root, 0, 1); - m_depth = buildNode(m_root, parentObject, 1, m_maximumDepth); - } else { - m_depth = buildNode(m_root, this, 0, m_maximumDepth); + if (m_model->data(m_root, m_sizeRole).toReal() > 0) { + if (m_root.isValid()) { + QObject *parentObject = appendChild(this, this, qmlContext(this), m_root, 0, 1); + m_depth = buildNode(m_root, parentObject, 1, m_maximumDepth); + } else { + m_depth = buildNode(m_root, this, 0, m_maximumDepth); + } } emit depthChanged(m_depth); diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index c3b0f13f7c..e8e8938739 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -447,7 +447,11 @@ bool Environment::isSameExecutable(const QString &exe1, const QString &exe2) con const QStringList exe2List = appendExeExtensions(exe2); for (const QString &i1 : exe1List) { for (const QString &i2 : exe2List) { - if (FileName::fromString(i1) == FileName::fromString(i2)) + const FileName f1 = FileName::fromString(i1); + const FileName f2 = FileName::fromString(i2); + if (f1 == f2) + return true; + if (FileUtils::resolveSymlinks(f1) == FileUtils::resolveSymlinks(f2)) return true; } } diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 8df7fdce43..4b9187bc5f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -418,7 +418,7 @@ FileName AndroidConfig::aaptToolPath() const aaptToolPath.appendPath("build-tools"); QString toolPath = QString("%1/aapt").arg(buildToolsVersion().toString()); if (HostOsInfo::isWindowsHost()) - toolPath += ANDROID_BAT_SUFFIX; + toolPath += QTC_HOST_EXE_SUFFIX; aaptToolPath.appendPath(toolPath); return aaptToolPath; } diff --git a/src/plugins/autotest/quick/quicktestparser.cpp b/src/plugins/autotest/quick/quicktestparser.cpp index 73e6ed3080..6e9b4ae82e 100644 --- a/src/plugins/autotest/quick/quicktestparser.cpp +++ b/src/plugins/autotest/quick/quicktestparser.cpp @@ -108,7 +108,8 @@ static QString quickTestSrcDir(const CppTools::CppModelManager *cppMM, return QString(); } -static QString quickTestName(const CPlusPlus::Document::Ptr &doc) +static QString quickTestName(const CPlusPlus::Document::Ptr &doc, + const CPlusPlus::Snapshot &snapshot) { const QList<CPlusPlus::Document::MacroUse> macros = doc->macroUses(); @@ -122,7 +123,18 @@ static QString quickTestName(const CPlusPlus::Document::Ptr &doc) .mid(arg.bytesBegin(), arg.bytesEnd() - arg.bytesBegin())); } } - return QString(); + + // check for using quick_test_main() directly + const QString fileName = doc->fileName(); + const QByteArray &fileContent = CppParser::getFileContent(fileName); + CPlusPlus::Document::Ptr document = snapshot.preprocessedDocument(fileContent, fileName); + if (document.isNull()) + return QString(); + document->check(); + CPlusPlus::AST *ast = document->translationUnit()->ast(); + QuickTestAstVisitor astVisitor(document, snapshot); + astVisitor.accept(ast); + return astVisitor.testBaseName(); } QList<QmlJS::Document::Ptr> QuickTestParser::scanDirectoryForQuickTestQmlFiles(const QString &srcDir) const @@ -212,10 +224,10 @@ static bool checkQmlDocumentForQuickTestCode(QFutureInterface<TestParseResultPtr bool QuickTestParser::handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface, CPlusPlus::Document::Ptr document, - const Core::Id &id) const + const Core::Id &id) { const CppTools::CppModelManager *modelManager = CppTools::CppModelManager::instance(); - if (quickTestName(document).isEmpty()) + if (quickTestName(document, m_cppSnapshot).isEmpty()) return false; const QString cppFileName = document->fileName(); @@ -223,7 +235,7 @@ bool QuickTestParser::handleQtQuickTest(QFutureInterface<TestParseResultPtr> fut if (ppList.isEmpty()) // happens if shutting down while parsing return false; const QString &proFile = ppList.at(0)->projectFile; - + m_mainCppFiles.insert(cppFileName, proFile); const QString srcDir = quickTestSrcDir(modelManager, cppFileName); if (srcDir.isEmpty()) return false; @@ -306,8 +318,21 @@ QuickTestParser::~QuickTestParser() void QuickTestParser::init(const QStringList &filesToParse, bool fullParse) { m_qmlSnapshot = QmlJSTools::Internal::ModelManager::instance()->snapshot(); - if (!fullParse) // in a full parse we get the correct entry points by the respective main + if (!fullParse) { + // in a full parse we get the correct entry points by the respective main m_proFilesForQmlFiles = QuickTestUtils::proFilesForQmlFiles(id(), filesToParse); + // get rid of cached main cpp files that are going to get processed anyhow + for (const QString &file : filesToParse) { + if (m_mainCppFiles.contains(file)) { + m_mainCppFiles.remove(file); + if (m_mainCppFiles.isEmpty()) + break; + } + } + } else { + // get rid of all cached main cpp files + m_mainCppFiles.clear(); + } CppParser::init(filesToParse, fullParse); } @@ -336,5 +361,10 @@ bool QuickTestParser::processDocument(QFutureInterface<TestParseResultPtr> futur return handleQtQuickTest(futureInterface, document, id()); } +QString QuickTestParser::projectFileForMainCppFile(const QString &fileName) const +{ + return m_mainCppFiles.contains(fileName) ? m_mainCppFiles.value(fileName) : QString(); +} + } // namespace Internal } // namespace Autotest diff --git a/src/plugins/autotest/quick/quicktestparser.h b/src/plugins/autotest/quick/quicktestparser.h index 94d0640fc0..6d005bec4e 100644 --- a/src/plugins/autotest/quick/quicktestparser.h +++ b/src/plugins/autotest/quick/quicktestparser.h @@ -51,11 +51,12 @@ public: void release() override; bool processDocument(QFutureInterface<TestParseResultPtr> futureInterface, const QString &fileName) override; + QString projectFileForMainCppFile(const QString &fileName) const; signals: void updateWatchPaths(const QStringList &directories) const; private: bool handleQtQuickTest(QFutureInterface<TestParseResultPtr> futureInterface, - CPlusPlus::Document::Ptr document, const Core::Id &id) const; + CPlusPlus::Document::Ptr document, const Core::Id &id); void handleDirectoryChanged(const QString &directory); void doUpdateWatchPaths(const QStringList &directories); QList<QmlJS::Document::Ptr> scanDirectoryForQuickTestQmlFiles(const QString &srcDir) const; @@ -63,6 +64,7 @@ private: QHash<QString, QString> m_proFilesForQmlFiles; QFileSystemWatcher m_directoryWatcher; QMap<QString, QMap<QString, QDateTime> > m_watchedFiles; + QMap<QString, QString> m_mainCppFiles; }; } // namespace Internal diff --git a/src/plugins/autotest/quick/quicktesttreeitem.cpp b/src/plugins/autotest/quick/quicktesttreeitem.cpp index dc17be469b..227c56410f 100644 --- a/src/plugins/autotest/quick/quicktesttreeitem.cpp +++ b/src/plugins/autotest/quick/quicktesttreeitem.cpp @@ -25,6 +25,7 @@ #include "quicktesttreeitem.h" #include "quicktestconfiguration.h" +#include "quicktestframework.h" #include "quicktestparser.h" #include "../testframeworkmanager.h" @@ -426,6 +427,23 @@ QSet<QString> QuickTestTreeItem::internalTargets() const return result; } +void QuickTestTreeItem::markForRemovalRecursively(const QString &filePath) +{ + static const Core::Id id = Core::Id(Constants::FRAMEWORK_PREFIX).withSuffix( + QuickTest::Constants::FRAMEWORK_NAME); + TestTreeItem::markForRemovalRecursively(filePath); + auto parser = dynamic_cast<QuickTestParser *>(TestFrameworkManager::instance() + ->testParserForTestFramework(id)); + const QString proFile = parser->projectFileForMainCppFile(filePath); + if (!proFile.isEmpty()) { + TestTreeItem *root = TestFrameworkManager::instance()->rootNodeForTestFramework(id); + root->forAllChildren([proFile](TestTreeItem *it) { + if (it->proFile() == proFile) + it->markForRemoval(true); + }); + } +} + TestTreeItem *QuickTestTreeItem::unnamedQuickTests() const { if (type() != Root) diff --git a/src/plugins/autotest/quick/quicktesttreeitem.h b/src/plugins/autotest/quick/quicktesttreeitem.h index e00afc434b..97c287f38f 100644 --- a/src/plugins/autotest/quick/quicktesttreeitem.h +++ b/src/plugins/autotest/quick/quicktesttreeitem.h @@ -54,6 +54,7 @@ public: bool removeOnSweepIfEmpty() const override; TestTreeItem *createParentGroupNode() const override; QSet<QString> internalTargets() const override; + void markForRemovalRecursively(const QString &filePath) override; private: TestTreeItem *unnamedQuickTests() const; }; diff --git a/src/plugins/autotest/quick/quicktestvisitors.cpp b/src/plugins/autotest/quick/quicktestvisitors.cpp index 9e4752821b..cbc5f9b2a2 100644 --- a/src/plugins/autotest/quick/quicktestvisitors.cpp +++ b/src/plugins/autotest/quick/quicktestvisitors.cpp @@ -25,6 +25,7 @@ #include "quicktestvisitors.h" +#include <cplusplus/Overview.h> #include <qmljs/parser/qmljsast_p.h> #include <qmljs/qmljsbind.h> #include <qmljs/qmljslink.h> @@ -161,5 +162,48 @@ bool TestQmlVisitor::visit(QmlJS::AST::StringLiteral *ast) return false; } +/************************************** QuickTestAstVisitor *************************************/ + +QuickTestAstVisitor::QuickTestAstVisitor(CPlusPlus::Document::Ptr doc, + const CPlusPlus::Snapshot &snapshot) + : ASTVisitor(doc->translationUnit()) + , m_currentDoc(doc) + , m_snapshot(snapshot) +{ +} + +bool QuickTestAstVisitor::visit(CPlusPlus::CallAST *ast) +{ + if (m_currentDoc.isNull()) + return false; + + if (const auto expressionAST = ast->base_expression) { + if (const auto idExpressionAST = expressionAST->asIdExpression()) { + if (const auto simpleNameAST = idExpressionAST->name->asSimpleName()) { + const CPlusPlus::Overview o; + const QString prettyName = o.prettyName(simpleNameAST->name); + if (prettyName == "quick_test_main" || prettyName == "quick_test_main_with_setup") { + if (auto expressionListAST = ast->expression_list) { + // third argument is the one we need, so skip current and next + expressionListAST = expressionListAST->next; // argv + expressionListAST = expressionListAST ? expressionListAST->next : nullptr; // testcase literal + + if (expressionListAST && expressionListAST->value) { + const auto *stringLitAST = expressionListAST->value->asStringLiteral(); + const auto *string + = translationUnit()->stringLiteral(stringLitAST->literal_token); + if (string) { + m_testBaseName = QString::fromUtf8(string->chars(), + int(string->size())); + } + } + } + } + } + } + } + return false; +} + } // namespace Internal } // namespace Autotest diff --git a/src/plugins/autotest/quick/quicktestvisitors.h b/src/plugins/autotest/quick/quicktestvisitors.h index f131339475..025ce0198d 100644 --- a/src/plugins/autotest/quick/quicktestvisitors.h +++ b/src/plugins/autotest/quick/quicktestvisitors.h @@ -27,6 +27,8 @@ #include "quicktesttreeitem.h" +#include <cplusplus/ASTVisitor.h> +#include <cplusplus/CppDocument.h> #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsdocument.h> @@ -65,5 +67,19 @@ private: bool m_expectTestCaseName = false; }; +class QuickTestAstVisitor : public CPlusPlus::ASTVisitor +{ +public: + QuickTestAstVisitor(CPlusPlus::Document::Ptr doc, const CPlusPlus::Snapshot &snapshot); + + bool visit(CPlusPlus::CallAST *ast) override; + + QString testBaseName() const { return m_testBaseName; } +private: + QString m_testBaseName; + CPlusPlus::Document::Ptr m_currentDoc; + CPlusPlus::Snapshot m_snapshot; +}; + } // namespace Internal } // namespace Autotest diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 6463dcf53e..306ec7b4e1 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -356,7 +356,7 @@ QString CMakeBuildStep::allArguments(const CMakeRunConfiguration *rc) const if (isCurrentExecutableTarget(m_buildTarget)) { if (rc) - target = rc->buildKey(); + target = rc->buildKey().section('\n', 0, 0); else target = "<i><" + tr(ADD_RUNCONFIGURATION_TEXT) + "></i>"; } else { diff --git a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp index 69f40ab06b..33d2123238 100644 --- a/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/filepropertiesdialog.cpp @@ -33,6 +33,7 @@ #include <QDateTime> #include <QDebug> +#include <QDir> #include <QFileInfo> #include <QLocale> @@ -68,7 +69,7 @@ void FilePropertiesDialog::refresh() QLocale locale; m_ui->name->setText(fileInfo.fileName()); - m_ui->path->setText(fileInfo.canonicalPath()); + m_ui->path->setText(QDir::toNativeSeparators(fileInfo.canonicalPath())); m_ui->mimeType->setText(Utils::mimeTypeForFile(fileInfo).name()); diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index f8222a3682..a647930e35 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -451,7 +451,7 @@ void DocumentManager::filePathChanged(const FileName &oldName, const FileName &n */ void DocumentManager::addDocument(IDocument *document, bool addWatcher) { - addDocuments(QList<IDocument *>() << document, addWatcher); + addDocuments({document}, addWatcher); } void DocumentManager::documentDestroyed(QObject *obj) diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index 58abcae5b1..08e3ecc29b 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -35,6 +35,7 @@ #include <app/app_version.h> +#include <utils/algorithm.h> #include <utils/fileutils.h> #include <utils/macroexpander.h> #include <utils/qtcassert.h> @@ -574,7 +575,11 @@ bool ExternalToolRunner::resolve() MacroExpander *expander = globalMacroExpander(); - m_resolvedEnvironment.modify(m_tool->environment()); + QList<EnvironmentItem> expandedEnvironment + = Utils::transform(m_tool->environment(), [expander](const EnvironmentItem &item) { + return EnvironmentItem(item.name, expander->expand(item.value), item.operation); + }); + m_resolvedEnvironment.modify(expandedEnvironment); { // executable diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp index 94f71bc3ca..74cc13b6db 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp @@ -312,10 +312,10 @@ bool AbstractMsvcToolChain::canClone() const return true; } -bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment &env, - const QString &batchFile, - const QString &batchArgs, - QMap<QString, QString> &envPairs) +Utils::optional<QString> AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment &env, + const QString &batchFile, + const QString &batchArgs, + QMap<QString, QString> &envPairs) { const QString marker = "####################"; // Create a temporary file name for the output. Use a temporary file here @@ -338,7 +338,7 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment saver.write("@echo " + marker.toLocal8Bit() + "\r\n"); if (!saver.finalize()) { qWarning("%s: %s", Q_FUNC_INFO, qPrintable(saver.errorString())); - return false; + return QString(); } Utils::SynchronousProcess run; @@ -365,12 +365,9 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment QString command = QDir::toNativeSeparators(batchFile); if (!response.stdErr().isEmpty()) { - TaskHub::addTask(Task::Error, - QCoreApplication::translate("ProjectExplorer::Internal::AbstractMsvcToolChain", - "Failed to retrieve MSVC Environment from \"%1\":\n" - "%2") - .arg(command, response.stdErr()), Constants::TASK_CATEGORY_COMPILE); - return false; + return QCoreApplication::translate("ProjectExplorer::Internal::AbstractMsvcToolChain", + "Failed to retrieve MSVC Environment from \"%1\":\n" + "%2").arg(command, response.stdErr()); } if (response.result != Utils::SynchronousProcessResponse::Finished) { @@ -378,12 +375,9 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment qWarning().noquote() << message; if (!batchArgs.isEmpty()) command += ' ' + batchArgs; - TaskHub::addTask(Task::Error, - QCoreApplication::translate("ProjectExplorer::Internal::AbstractMsvcToolChain", - "Failed to retrieve MSVC Environment from \"%1\":\n" - "%2") - .arg(command, message), Constants::TASK_CATEGORY_COMPILE); - return false; + return QCoreApplication::translate("ProjectExplorer::Internal::AbstractMsvcToolChain", + "Failed to retrieve MSVC Environment from \"%1\":\n" + "%2").arg(command, message); } // The SDK/MSVC scripts do not return exit codes != 0. Check on stdout. @@ -394,13 +388,13 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment const int start = stdOut.indexOf(marker); if (start == -1) { qWarning("Could not find start marker in stdout output."); - return false; + return QString(); } const int end = stdOut.indexOf(marker, start + 1); if (end == -1) { qWarning("Could not find end marker in stdout output."); - return false; + return QString(); } const QString output = stdOut.mid(start, end - start); @@ -414,7 +408,7 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(const Utils::Environment } } - return true; + return Utils::nullopt; } /** diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.h b/src/plugins/projectexplorer/abstractmsvctoolchain.h index 8dc0485a0e..7feee8561c 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.h +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.h @@ -33,6 +33,7 @@ #include <utils/environment.h> #include <utils/fileutils.h> +#include <utils/optional.h> namespace ProjectExplorer { namespace Internal { @@ -71,10 +72,10 @@ public: bool operator ==(const ToolChain &) const override; - static bool generateEnvironmentSettings(const Utils::Environment &env, - const QString &batchFile, - const QString &batchArgs, - QMap<QString, QString> &envPairs); + static Utils::optional<QString> generateEnvironmentSettings(const Utils::Environment &env, + const QString &batchFile, + const QString &batchArgs, + QMap<QString, QString> &envPairs); protected: class WarningFlagAdder diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index d56d6a6413..1a2757e5ca 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -27,6 +27,7 @@ #include "msvcparser.h" #include "projectexplorerconstants.h" +#include "taskhub.h" #include "toolchainmanager.h" #include <utils/algorithm.h> @@ -526,46 +527,57 @@ static QString winExpandDelayedEnvReferences(QString in, const Utils::Environmen return in; } -void MsvcToolChain::environmentModifications(QFutureInterface<QList<Utils::EnvironmentItem>> &future, - QString vcvarsBat, QString varsBatArg) +void MsvcToolChain::environmentModifications( + QFutureInterface<MsvcToolChain::GenerateEnvResult> &future, + QString vcvarsBat, QString varsBatArg) { const Utils::Environment inEnv = Utils::Environment::systemEnvironment(); Utils::Environment outEnv; QMap<QString, QString> envPairs; - if (!generateEnvironmentSettings(inEnv, vcvarsBat, varsBatArg, envPairs)) - return; - - // Now loop through and process them - for (auto envIter = envPairs.cbegin(), eend = envPairs.cend(); envIter != eend; ++envIter) { - const QString expandedValue = winExpandDelayedEnvReferences(envIter.value(), inEnv); - if (!expandedValue.isEmpty()) - outEnv.set(envIter.key(), expandedValue); - } + QList<Utils::EnvironmentItem> diff; + Utils::optional<QString> error = generateEnvironmentSettings(inEnv, vcvarsBat, + varsBatArg, envPairs); + if (!error) { + + // Now loop through and process them + for (auto envIter = envPairs.cbegin(), end = envPairs.cend(); envIter != end; ++envIter) { + const QString expandedValue = winExpandDelayedEnvReferences(envIter.value(), inEnv); + if (!expandedValue.isEmpty()) + outEnv.set(envIter.key(), expandedValue); + } - if (debug) { - const QStringList newVars = outEnv.toStringList(); - const QStringList oldVars = inEnv.toStringList(); - QDebug nsp = qDebug().nospace(); - foreach (const QString &n, newVars) { - if (!oldVars.contains(n)) - nsp << n << '\n'; + if (debug) { + const QStringList newVars = outEnv.toStringList(); + const QStringList oldVars = inEnv.toStringList(); + QDebug nsp = qDebug().nospace(); + foreach (const QString &n, newVars) { + if (!oldVars.contains(n)) + nsp << n << '\n'; + } } - } - QList<Utils::EnvironmentItem> diff = inEnv.diff(outEnv, true); - for (int i = diff.size() - 1; i >= 0; --i) { - if (diff.at(i).name.startsWith(QLatin1Char('='))) { // Exclude "=C:", "=EXITCODE" - diff.removeAt(i); + diff = inEnv.diff(outEnv, true); + for (int i = diff.size() - 1; i >= 0; --i) { + if (diff.at(i).name.startsWith(QLatin1Char('='))) { // Exclude "=C:", "=EXITCODE" + diff.removeAt(i); + } } } - future.reportResult(diff); + future.reportResult({error, diff}); } -void MsvcToolChain::initEnvModWatcher(const QFuture<QList<Utils::EnvironmentItem> > &future) +void MsvcToolChain::initEnvModWatcher(const QFuture<GenerateEnvResult> &future) { - QObject::connect(&m_envModWatcher, &QFutureWatcher<QList<Utils::EnvironmentItem>>::resultReadyAt, [&]() { - updateEnvironmentModifications(m_envModWatcher.result()); + QObject::connect(&m_envModWatcher, &QFutureWatcher<GenerateEnvResult>::resultReadyAt, [&]() { + const GenerateEnvResult &result = m_envModWatcher.result(); + if (result.error) { + const QString &errorMessage = *result.error; + if (!errorMessage.isEmpty()) + TaskHub::addTask(Task::Error, errorMessage, Constants::TASK_CATEGORY_COMPILE); + } else { + updateEnvironmentModifications(result.environmentItems); + } }); m_envModWatcher.setFuture(future); } @@ -581,15 +593,23 @@ void MsvcToolChain::updateEnvironmentModifications(QList<Utils::EnvironmentItem> Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environment& env) const { - Utils::Environment result = env; + Utils::Environment resultEnv = env; if (m_environmentModifications.isEmpty()) { m_envModWatcher.waitForFinished(); - if (m_envModWatcher.future().isFinished() && !m_envModWatcher.future().isCanceled()) - result.modify(m_envModWatcher.result()); + if (m_envModWatcher.future().isFinished() && !m_envModWatcher.future().isCanceled()) { + const GenerateEnvResult &result = m_envModWatcher.result(); + if (result.error) { + const QString &errorMessage = *result.error; + if (!errorMessage.isEmpty()) + TaskHub::addTask(Task::Error, errorMessage, Constants::TASK_CATEGORY_COMPILE); + } else { + resultEnv.modify(result.environmentItems); + } + } } else { - result.modify(m_environmentModifications); + resultEnv.modify(m_environmentModifications); } - return result; + return resultEnv; } // -------------------------------------------------------------------------- @@ -611,7 +631,14 @@ MsvcToolChain::MsvcToolChain(const MsvcToolChain &other) initEnvModWatcher(other.m_envModWatcher.future()); } else if (m_environmentModifications.isEmpty() && other.m_envModWatcher.future().isFinished() && !other.m_envModWatcher.future().isCanceled()) { - m_environmentModifications = other.m_envModWatcher.result(); + const GenerateEnvResult &result = m_envModWatcher.result(); + if (result.error) { + const QString &errorMessage = *result.error; + if (!errorMessage.isEmpty()) + TaskHub::addTask(Task::Error, errorMessage, Constants::TASK_CATEGORY_COMPILE); + } else { + updateEnvironmentModifications(result.environmentItems); + } } setDisplayName(other.displayName()); diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index fe1922c2f0..9bbf36757c 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -31,6 +31,8 @@ #include <QFutureWatcher> +#include <utils/optional.h> + QT_FORWARD_DECLARE_CLASS(QLabel) QT_FORWARD_DECLARE_CLASS(QVersionNumber) @@ -92,13 +94,18 @@ protected: const Utils::Environment &env) const override; private: - static void environmentModifications(QFutureInterface<QList<Utils::EnvironmentItem> > &future, + struct GenerateEnvResult + { + Utils::optional<QString> error; + QList<Utils::EnvironmentItem> environmentItems; + }; + static void environmentModifications(QFutureInterface<GenerateEnvResult> &future, QString vcvarsBat, QString varsBatArg); - void initEnvModWatcher(const QFuture<QList<Utils::EnvironmentItem>> &future); + void initEnvModWatcher(const QFuture<GenerateEnvResult> &future); void updateEnvironmentModifications(QList<Utils::EnvironmentItem> modifications); mutable QList<Utils::EnvironmentItem> m_environmentModifications; - mutable QFutureWatcher<QList<Utils::EnvironmentItem>> m_envModWatcher; + mutable QFutureWatcher<GenerateEnvResult> m_envModWatcher; QString m_varsBatArg; // Argument }; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index cccca0ea4a..08082200a6 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1490,6 +1490,13 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er return BuildConfiguration::buildTypeName(type); }); + expander->registerPrefix(Constants::VAR_CURRENTBUILD_ENV, + BuildConfiguration::tr("Variables in the current build environment"), + [](const QString &var) { + if (BuildConfiguration *bc = activeBuildConfiguration()) + return bc->environment().value(var); + return QString(); + }); QString fileDescription = tr("File where current session is saved."); auto fileHandler = [] { return SessionManager::sessionNameToFileName(SessionManager::activeSession()).toString(); }; diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index 226b85e67d..cbb375da61 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -314,9 +314,15 @@ void FlatModel::handleProjectAdded(Project *project) QTC_ASSERT(project, return); connect(project, &Project::parsingStarted, - this, [this, project]() { parsingStateChanged(project); }); + this, [this, project]() { + if (nodeForProject(project)) + parsingStateChanged(project); + }); connect(project, &Project::parsingFinished, - this, [this, project]() { parsingStateChanged(project); }); + this, [this, project]() { + if (nodeForProject(project)) + parsingStateChanged(project); + }); addOrRebuildProjectModel(project); } diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp index ee3c729e23..82343bafd9 100644 --- a/src/plugins/projectexplorer/userfileaccessor.cpp +++ b/src/plugins/projectexplorer/userfileaccessor.cpp @@ -354,10 +354,9 @@ static QString generateSuffix(const QString &suffix) static inline Utils::optional<QString> defineExternalUserFileDir() { static const char userFilePathVariable[] = "QTC_USER_FILE_PATH"; - static QString userFilePath = QFile::decodeName(qgetenv(userFilePathVariable)); - if (userFilePath.isEmpty()) - return QString(); - const QFileInfo fi(userFilePath); + if (Q_LIKELY(!qEnvironmentVariableIsSet(userFilePathVariable))) + return nullopt; + const QFileInfo fi(QFile::decodeName(qgetenv(userFilePathVariable))); const QString path = fi.absoluteFilePath(); if (fi.isDir() || fi.isSymLink()) return path; @@ -407,7 +406,7 @@ static FileName externalUserFilePath(const Utils::FileName &projectFilePath, con FileName result; static const optional<QString> externalUserFileDir = defineExternalUserFileDir(); - if (!externalUserFileDir) { + if (externalUserFileDir) { // Recreate the relative project file hierarchy under the shared directory. // PersistentSettingsWriter::write() takes care of creating the path. result = FileName::fromString(externalUserFileDir.value()); diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 1aadaa081a..140c2ef937 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -203,6 +203,7 @@ bool QmlDesignerPlugin::delayedInitialize() void QmlDesignerPlugin::extensionsInitialized() { + Core::DesignMode::setDesignModeIsRequired(); // delay after Core plugin's extensionsInitialized, so the DesignMode is availabe connect(Core::ICore::instance(), &Core::ICore::coreAboutToOpen, this, [this] { integrateIntoQtCreator(&d->mainWidget); diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 5e9b3dc076..4407de9a06 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -70,8 +70,8 @@ namespace Internal { const char C_FALLBACK_ROOT[] = "ProjectsFallbackRoot"; -const int itemWidth = 240; -const int itemHeight = 240; +const int itemWidth = 230; +const int itemHeight = 230; const int itemGap = 10; const int tagsSeparatorY = itemHeight - 60; @@ -293,12 +293,70 @@ public: } }; -class GridProxyModel : public QIdentityProxyModel +class GridProxyModel : public QAbstractItemModel { public: + using OptModelIndex = Utils::optional<QModelIndex>; + GridProxyModel() {} + void setSourceModel(QAbstractItemModel *newModel) + { + if (m_sourceModel == newModel) + return; + if (m_sourceModel) + disconnect(m_sourceModel, nullptr, this, nullptr); + m_sourceModel = newModel; + if (newModel) { + connect(newModel, &QAbstractItemModel::layoutAboutToBeChanged, this, [this] { + layoutAboutToBeChanged(); + }); + connect(newModel, &QAbstractItemModel::layoutChanged, this, [this] { layoutChanged(); }); + connect(newModel, &QAbstractItemModel::modelAboutToBeReset, this, [this] { + beginResetModel(); + }); + connect(newModel, &QAbstractItemModel::modelReset, this, [this] { endResetModel(); }); + connect(newModel, &QAbstractItemModel::rowsAboutToBeInserted, this, [this] { + beginResetModel(); + }); + connect(newModel, &QAbstractItemModel::rowsInserted, this, [this] { endResetModel(); }); + connect(newModel, &QAbstractItemModel::rowsAboutToBeRemoved, this, [this] { + beginResetModel(); + }); + connect(newModel, &QAbstractItemModel::rowsRemoved, this, [this] { endResetModel(); }); + } + } + + QAbstractItemModel *sourceModel() const + { + return m_sourceModel; + } + + QVariant data(const QModelIndex &index, int role) const final + { + const OptModelIndex sourceIndex = mapToSource(index); + if (sourceIndex) + return sourceModel()->data(*sourceIndex, role); + return QVariant(); + } + + Qt::ItemFlags flags(const QModelIndex &index) const final + { + const OptModelIndex sourceIndex = mapToSource(index); + if (sourceIndex) + return sourceModel()->flags(*sourceIndex); + return Qt::ItemFlags(); + } + + bool hasChildren(const QModelIndex &parent) const final + { + const OptModelIndex sourceParent = mapToSource(parent); + if (sourceParent) + return sourceModel()->hasChildren(*sourceParent); + return false; + } + void setColumnCount(int columnCount) { if (columnCount == m_columnCount) @@ -333,15 +391,19 @@ public: return QModelIndex(); } - QModelIndex mapToSource(const QModelIndex &proxyIndex) const final + // The items at the lower right of the grid might not correspond to source items, if + // source's row count is not N*columnCount + OptModelIndex mapToSource(const QModelIndex &proxyIndex) const { if (!proxyIndex.isValid()) return QModelIndex(); int sourceRow = proxyIndex.row() * m_columnCount + proxyIndex.column(); - return sourceModel()->index(sourceRow, 0); + if (sourceRow < sourceModel()->rowCount()) + return sourceModel()->index(sourceRow, 0); + return OptModelIndex(); } - QModelIndex mapFromSource(const QModelIndex &sourceIndex) const final + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const { if (!sourceIndex.isValid()) return QModelIndex(); @@ -352,6 +414,7 @@ public: } private: + QAbstractItemModel *m_sourceModel = nullptr; int m_columnCount = 1; }; diff --git a/src/plugins/winrt/winrtdebugsupport.cpp b/src/plugins/winrt/winrtdebugsupport.cpp index 6721bf9f30..f7962c4ef0 100644 --- a/src/plugins/winrt/winrtdebugsupport.cpp +++ b/src/plugins/winrt/winrtdebugsupport.cpp @@ -75,6 +75,7 @@ WinRtDebugSupport::WinRtDebugSupport(RunControl *runControl) setQmlServer(qmlServer); } + setSymbolFile(runControl->runConfiguration()->buildTargetInfo().targetFilePath.toString()); QString errorMessage; m_runner = new WinRtRunnerHelper(this, &errorMessage); if (!errorMessage.isEmpty()) { diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml index 6e450d237f..f365591132 100644 --- a/src/share/qtcreator/externaltools/lrelease.xml +++ b/src/share/qtcreator/externaltools/lrelease.xml @@ -36,5 +36,6 @@ <path>lrelease</path> <arguments>%{CurrentProject:FilePath}</arguments> <workingdirectory>%{CurrentProject:Path}</workingdirectory> + <environment>PATH%3D%25%7BJS%3Aif%20%28%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%29%20%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%3B%20else%20%22%25%7BEnv%3APATH%7D%22%7D</environment> </executable> </externaltool> diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml index 8991c13439..bc2e350282 100644 --- a/src/share/qtcreator/externaltools/lupdate.xml +++ b/src/share/qtcreator/externaltools/lupdate.xml @@ -36,5 +36,6 @@ <path>lupdate</path> <arguments>%{CurrentProject:FilePath}</arguments> <workingdirectory>%{CurrentProject:Path}</workingdirectory> + <environment>PATH%3D%25%7BJS%3Aif%20%28%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%29%20%22%25%7BCurrentBuild%3AEnv%3APATH%7D%22%3B%20else%20%22%25%7BEnv%3APATH%7D%22%7D</environment> </executable> </externaltool> diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 73d0d3a247162b91d6b2c78f5a490e006168a2e +Subproject 2440b19b288096e1601674de2ac15c560af469c diff --git a/tests/system/shared/welcome.py b/tests/system/shared/welcome.py index 73ee0a486e..dc48424a5c 100644 --- a/tests/system/shared/welcome.py +++ b/tests/system/shared/welcome.py @@ -59,6 +59,13 @@ def getWelcomeTreeView(treeViewLabel): except: return None +def switchToSubMode(subModeLabel): + wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton(subModeLabel) + frameAndLabelFound = all((wsButtonFrame, wsButtonLabel)) + if frameAndLabelFound: + mouseClick(wsButtonLabel) + return frameAndLabelFound + def findExampleOrTutorial(tableView, regex, verbose=False): model = tableView.model() children = __childrenOfType__(tableView, 'QModelIndex') diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py index d4d2d25bde..89bb63353f 100755 --- a/tests/system/suite_WELP/tst_WELP01/test.py +++ b/tests/system/suite_WELP/tst_WELP01/test.py @@ -82,7 +82,7 @@ def main(): setFixedHelpViewer(HelpViewer.HELPMODE) addCurrentCreatorDocumentation() - buttonsAndState = {'Projects':True, 'Examples':False, 'Tutorials':False} + buttonsAndState = {'Projects':False, 'Examples':True, 'Tutorials':False} for button, state in buttonsAndState.items(): wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton(button) if test.verify(all((wsButtonFrame, wsButtonLabel)), @@ -90,6 +90,8 @@ def main(): test.compare(buttonActive(wsButtonFrame), state, "Verifying whether '%s' button is active (%s)." % (button, state)) + # select Projects and roughly check this + switchToSubMode('Projects') for button in ['New Project', 'Open Project']: wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton(button) if test.verify(all((wsButtonFrame, wsButtonLabel)), @@ -130,9 +132,7 @@ def main(): test.verify(wsButtonFrame is not None and wsButtonLabel is not None, "Verifying: Getting Started topic is being displayed.") # select Examples and roughly check them - wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton('Examples') - if all((wsButtonFrame, wsButtonLabel)): - mouseClick(wsButtonLabel) + switchToSubMode('Examples') test.verify(waitForButtonsState(False, True, False), "Buttons' states have changed.") expect = (("QTableView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'", @@ -147,9 +147,7 @@ def main(): "Verifying that at least one example is displayed.") # select Tutorials and roughly check them - wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton('Tutorials') - if all((wsButtonFrame, wsButtonLabel)): - mouseClick(wsButtonLabel) + switchToSubMode('Tutorials') test.verify(waitForButtonsState(False, False, True), "Buttons' states have changed.") expect = (("QTableView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'", "tutorials list"), diff --git a/tests/system/suite_WELP/tst_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py index e809a753df..aaf80e5e80 100644 --- a/tests/system/suite_WELP/tst_WELP02/test.py +++ b/tests/system/suite_WELP/tst_WELP02/test.py @@ -74,6 +74,7 @@ def main(): if not startedWithoutPluginError(): return + switchToSubMode('Projects') typePropDet = (("QPushButton", "Get Started Now", "Get Started Now button"), ("QTreeView", "Sessions", "Sessions section"), ("SessionModelIndex", ("default", False), "default session listed"), diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index b6d4e1c940..347d37ec1a 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -74,9 +74,7 @@ def main(): invokeMenuItem("File", "Exit") return # select "Examples" topic - wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton('Examples') - if all((wsButtonFrame, wsButtonLabel)): - mouseClick(wsButtonLabel) + switchToSubMode('Examples') expect = (("QTableView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'", "examples list"), ("QLineEdit", "placeholderText='Search in Examples...'", "examples search line edit"), diff --git a/tests/system/suite_WELP/tst_WELP04/test.py b/tests/system/suite_WELP/tst_WELP04/test.py index 18659f2262..c1855ac0ed 100644 --- a/tests/system/suite_WELP/tst_WELP04/test.py +++ b/tests/system/suite_WELP/tst_WELP04/test.py @@ -37,10 +37,7 @@ def main(): invokeMenuItem("File", "Exit") return # select "Tutorials" - wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton('Tutorials') - if all((wsButtonFrame, wsButtonLabel)): - mouseClick(wsButtonLabel) - else: + if not switchToSubMode('Tutorials'): test.fatal("Could not find Tutorials button - leaving test") invokeMenuItem("File", "Exit") return |