summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-07-05 11:14:33 +0200
committerEike Ziller <eike.ziller@qt.io>2018-07-05 11:14:33 +0200
commit5c81a65422427289f0671b2f2b4d7e809105cbd7 (patch)
tree1ec9cd86aaa14511db73bb60bc7e48312854c31f
parentaa4407e332f62f2cb24dd8e8fb41d2469efba1fb (diff)
parent9bbb085718ca1af4f816331d450b2129e30ff281 (diff)
downloadqt-creator-5c81a65422427289f0671b2f2b4d7e809105cbd7.tar.gz
Merge remote-tracking branch 'origin/4.7'
Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: I29916313f12e25f3942ac926f8e4d4490074978e
-rw-r--r--doc/config/qtcreator-project.qdocconf4
-rw-r--r--doc/src/editors/creator-editors.qdoc25
-rw-r--r--doc/src/howto/creator-autotest.qdoc2
-rw-r--r--doc/src/howto/creator-keyboard-shortcuts.qdoc5
-rw-r--r--doc/src/howto/creator-ui.qdoc5
-rw-r--r--doc/src/howto/qtcreator-faq.qdoc2
-rw-r--r--doc/src/overview/creator-acknowledgements.qdoc6
-rw-r--r--doc/src/overview/creator-commercial-overview.qdoc2
-rw-r--r--doc/src/overview/creator-design-overview.qdoc8
-rw-r--r--doc/src/overview/creator-issues.qdoc4
-rw-r--r--doc/src/overview/creator-overview.qdoc3
-rw-r--r--doc/src/overview/creator-tutorials.qdoc2
-rw-r--r--doc/src/projects/creator-projects-creating.qdoc2
-rw-r--r--doc/src/projects/creator-projects-overview.qdoc23
-rw-r--r--doc/src/projects/creator-projects-settings-build.qdoc5
-rw-r--r--doc/src/qtcreator-toc.qdoc9
-rw-r--r--doc/src/qtcreator.qdoc3
-rw-r--r--doc/src/qtquick/creator-mobile-app-tutorial.qdoc7
-rw-r--r--doc/src/qtquick/qtquick-app-development.qdoc4
-rw-r--r--doc/src/qtquick/qtquick-app-tutorial.qdoc6
-rw-r--r--doc/src/qtquick/qtquick-components.qdoc10
-rw-r--r--doc/src/qtquick/qtquick-connection-editor-backend.qdoc74
-rw-r--r--doc/src/qtquick/qtquick-connection-editor-bindings.qdoc65
-rw-r--r--doc/src/qtquick/qtquick-connection-editor-properties.qdoc58
-rw-r--r--doc/src/qtquick/qtquick-connection-editor-signals.qdoc71
-rw-r--r--doc/src/qtquick/qtquick-connection-editor.qdoc178
-rw-r--r--doc/src/qtquick/qtquick-creating.qdoc7
-rw-r--r--doc/src/qtquick/qtquick-designer.qdoc116
-rw-r--r--doc/src/qtquick/qtquick-exporting-qml.qdoc6
-rw-r--r--doc/src/qtquick/qtquick-modules-with-plugins.qdoc29
-rw-r--r--doc/src/qtquick/qtquick-screens.qdoc17
-rw-r--r--doc/src/qtquick/qtquick-states.qdoc88
-rw-r--r--share/qtcreator/debugger/gdbbridge.py2
-rw-r--r--share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json8
-rw-r--r--share/qtcreator/translations/qtcreator_ru.ts3158
-rw-r--r--src/libs/qmljs/qmljscheck.cpp44
-rw-r--r--src/libs/qmljs/qmljsfindexportedcpptypes.cpp4
-rw-r--r--src/libs/qmljs/qmljsinterpreter.cpp20
-rw-r--r--src/libs/qmljs/qmljsreformatter.cpp174
-rw-r--r--src/libs/tracing/timelineitemsrenderpass.cpp10
-rw-r--r--src/libs/tracing/timelinenotesrenderpass.cpp8
-rw-r--r--src/libs/utils/fancylineedit.cpp2
-rw-r--r--src/libs/utils/images/filtericon.pngbin127 -> 164 bytes
-rw-r--r--src/libs/utils/images/filtericon@2x.pngbin170 -> 193 bytes
-rw-r--r--src/libs/utils/images/toolbuttonexpandarrow.pngbin0 -> 110 bytes
-rw-r--r--src/libs/utils/images/toolbuttonexpandarrow@2x.pngbin0 -> 128 bytes
-rw-r--r--src/libs/utils/pathchooser.cpp2
-rw-r--r--src/libs/utils/pathlisteditor.cpp2
-rw-r--r--src/libs/utils/savefile.cpp2
-rw-r--r--src/libs/utils/shellcommand.cpp1
-rw-r--r--src/libs/utils/shellcommand.h1
-rw-r--r--src/libs/utils/synchronousprocess.cpp2
-rw-r--r--src/libs/utils/utils.qrc2
-rw-r--r--src/libs/utils/utilsicons.cpp3
-rw-r--r--src/plugins/autotest/gtest/gtesttreeitem.cpp7
-rw-r--r--src/plugins/autotest/qtest/qttestresult.cpp3
-rw-r--r--src/plugins/beautifier/uncrustify/uncrustify.cpp2
-rw-r--r--src/plugins/clangtools/clangfileinfo.h14
-rw-r--r--src/plugins/clangtools/clangfixitsrefactoringchanges.cpp42
-rw-r--r--src/plugins/clangtools/clangfixitsrefactoringchanges.h8
-rw-r--r--src/plugins/clangtools/clangselectablefilesdialog.cpp6
-rw-r--r--src/plugins/clangtools/clangtidyclazytool.cpp7
-rw-r--r--src/plugins/clangtools/clangtool.cpp4
-rw-r--r--src/plugins/coreplugin/documentmanager.cpp10
-rw-r--r--src/plugins/coreplugin/documentmanager.h2
-rw-r--r--src/plugins/coreplugin/fancytabwidget.cpp7
-rw-r--r--src/plugins/cppeditor/cppquickfixes.cpp4
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp27
-rw-r--r--src/plugins/cpptools/cpplocatorfilter_test.cpp10
-rw-r--r--src/plugins/cpptools/cppmodelmanager.cpp30
-rw-r--r--src/plugins/cpptools/cppmodelmanager.h7
-rw-r--r--src/plugins/debugger/debuggerengine.cpp7
-rw-r--r--src/plugins/modeleditor/elementtasks.cpp6
-rw-r--r--src/plugins/projectexplorer/applicationlauncher.cpp2
-rw-r--r--src/plugins/projectexplorer/projectnodes.cpp4
-rw-r--r--src/plugins/projectexplorer/taskmodel.cpp53
-rw-r--r--src/plugins/projectexplorer/taskmodel.h1
-rw-r--r--src/plugins/projectexplorer/windebuginterface.cpp93
-rw-r--r--src/plugins/projectexplorer/windebuginterface.h11
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp9
-rw-r--r--src/plugins/qmldesigner/components/formeditor/movetool.cpp1
-rw-r--r--src/plugins/qmldesigner/designercore/model/rewriterview.cpp13
-rw-r--r--src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp18
-rw-r--r--src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp15
-rw-r--r--src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h1
-rw-r--r--src/plugins/texteditor/generichighlighter/specificrules.cpp15
-rw-r--r--src/plugins/texteditor/generichighlighter/specificrules.h11
-rw-r--r--src/plugins/texteditor/texteditor.cpp4
-rw-r--r--src/plugins/vcsbase/vcsbaseeditor.cpp8
-rw-r--r--src/plugins/vcsbase/vcscommand.cpp9
-rw-r--r--src/plugins/winrt/winrtdeployconfiguration.cpp3
-rw-r--r--src/share/3rdparty/generic-highlighter/bash.xml12
-rw-r--r--src/share/3rdparty/generic-highlighter/cmake.xml4037
-rw-r--r--src/share/3rdparty/generic-highlighter/ini.xml4
-rw-r--r--src/share/3rdparty/generic-highlighter/perl.xml2
-rw-r--r--src/share/3rdparty/generic-highlighter/yacc.xml134
m---------src/shared/qbs0
-rw-r--r--src/tools/clangbackend/source/clangbackend_global.h5
-rw-r--r--src/tools/clangbackend/source/clangtranslationunit.cpp15
-rw-r--r--src/tools/clangbackend/source/clangtranslationunitupdater.cpp3
-rw-r--r--src/tools/clangbackend/source/fulltokeninfo.cpp7
-rw-r--r--src/tools/clangbackend/source/tokenprocessor.h4
-rw-r--r--src/tools/icons/qtcreatoricons.svg26
-rw-r--r--tests/manual/debugger/cli-io/main.cpp2
-rw-r--r--tests/system/shared/editor_utils.py2
-rw-r--r--tests/system/shared/project.py2
-rw-r--r--tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv1
-rw-r--r--tests/system/suite_tools/tst_codepasting/test.py31
108 files changed, 6115 insertions, 2937 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 5762f9c6eb..983fc3e895 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -54,8 +54,8 @@ include(qt-defines.qdocconf)
sources.fileextensions = "*.qdoc"
qhp.projects = QtCreator
-qhp.QtCreator.file = $IDE_ID.qhp
-qhp.QtCreator.namespace = org.qt-project.$IDE_ID.$QTC_VERSION_TAG
+qhp.QtCreator.file = qtcreator.qhp
+qhp.QtCreator.namespace = org.qt-project.qtcreator.$QTC_VERSION_TAG
qhp.QtCreator.virtualFolder = doc
qhp.QtCreator.indexTitle = $IDE_DISPLAY_NAME Manual $QTC_VERSION
qhp.QtCreator.filterAttributes = $IDE_ID $QTC_VERSION
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 21e5506f93..b7297ed7d7 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -570,44 +570,45 @@
\row
\li M203
\li Warning
- \li Imperative code is not supported in the Qt Quick Designer
+ \li Imperative code is not supported in the Design mode
\li
\row
\li M204
\li Warning
- \li This QML type is not supported in the Qt Quick Designer
+ \li This QML type is not supported in the Design mode
\li
\row
\li M205
\li Warning
- \li Reference to parent QML type cannot be resolved correctly by the Qt
- Quick Designer
+ \li Reference to parent QML type cannot be resolved correctly by the
+ Design mode
\li
\row
\li M206
\li Warning
\li This visual property binding cannot be evaluated in the local
- context and might not show up in Qt Quick Designer as expected
+ context and might not show up in Design mode as expected
\li
\row
\li M207
\li Warning
- \li Qt Quick Designer only supports states in the root QML type
+ \li Design mode only supports states in the root QML type
\li
\row
\li M208
\li Error
- \li This id might be ambiguous and is not supported in the \QMLD.
+ \li This id might be ambiguous and is not supported in the Design mode.
\li
\row
\li M209
\li Error
- \li This type (type name) is not supported as a root element by \QMLD.
+ \li This type (type name) is not supported as a root element in the
+ Design mode.
\li
\row
@@ -813,15 +814,15 @@
instead of Qt Quick 2}.
You can see the error message when you move the mouse pointer over code that
- \QC underlines in the code editor or when you open a QML file in the
- \uicontrol Design mode.
+ \QC underlines in the code editor or when you open a QML file in the Design
+ mode.
To reset the code model, select \uicontrol Tools > \uicontrol {QML/JS} >
\uicontrol {Reset Code Model}.
If this does not help, try changing the QML emulation layer to the one that
was built with the same Qt version as the one selected in the build and run
- kit. For more information, see \l{Running QML Modules in Qt Quick Designer}.
+ kit. For more information, see \l{Running QML Modules in Design Mode}.
\section1 Inspecting QML and JavaScript
@@ -2729,7 +2730,7 @@
\image qtcreator-move-component-into-separate-file.png
\li QML type name. This action is also available in the
- \uicontrol {Form Editor} in \QMLD.
+ \uicontrol {Form Editor} in the Design mode.
\row
\li Split Initializer
\li Reformats a one-line type into a multi-line type. For example,
diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-autotest.qdoc
index 2d5ba935cd..08273d019c 100644
--- a/doc/src/howto/creator-autotest.qdoc
+++ b/doc/src/howto/creator-autotest.qdoc
@@ -235,7 +235,7 @@
select \uicontrol {GTest Filter} and specify the filter to use in the
\uicontrol {Active filter} field. For more information about GTest
filters, see
- \l{https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md#running-a-subset-of-the-tests}
+ \l{https://github.com/google/googletest/blob/master/googletest/docs/advanced.md#running-a-subset-of-the-tests}
{Running a Subset of the Tests}.
\image qtcreator-autotests-options.png
diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc
index 1247e9986b..75ee2adae9 100644
--- a/doc/src/howto/creator-keyboard-shortcuts.qdoc
+++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc
@@ -539,7 +539,10 @@
\li Ctrl+0
\endtable
- \section2 Qt Quick Designer Keyboard Shortcuts
+ \section2 Design Mode Keyboard Shortcuts
+
+ You can use the following keyboard shortcuts when editing QML files in the
+ Design mode.
\table
\header
diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc
index 8437d5e35b..5cb7a65a8f 100644
--- a/doc/src/howto/creator-ui.qdoc
+++ b/doc/src/howto/creator-ui.qdoc
@@ -152,8 +152,9 @@
\endlist
- For more information about the sidebar views that are only available in
- \QMLD, see \l{Using Qt Quick Designer}.
+ For more information about the sidebar views that are only
+ available when editing QML files in the Design mode, see
+ \l{Editing QML Files in Design Mode}.
You can change the view of the sidebars in the following ways:
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index 3bd14807ad..915f2c0c1a 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -104,7 +104,7 @@
\b {What should I do when \QC complains about missing OpenGL support?}
- Some parts of \QC, such as \QMLD and QML Profiler, use Qt Quick 2, which
+ Some parts of \QC, such as the Design mode and QML Profiler, use Qt Quick 2, which
relies on OpenGL API for drawing. Unfortunately, the use of OpenGL can cause
problems, especially in remote setups and with outdated drivers. In these
cases, \QC displays OpenGL-related error messages on the console or records
diff --git a/doc/src/overview/creator-acknowledgements.qdoc b/doc/src/overview/creator-acknowledgements.qdoc
index f62c2aa4d1..3687482108 100644
--- a/doc/src/overview/creator-acknowledgements.qdoc
+++ b/doc/src/overview/creator-acknowledgements.qdoc
@@ -36,6 +36,12 @@
\title Acknowledgements
+ \section1 Credits
+
+ We would like to thank our contributors, who are listed in the \QC
+ \l{https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist}{change logs}
+ for each release.
+
\section1 Third-party Components
\QC contains the following third-party components:
diff --git a/doc/src/overview/creator-commercial-overview.qdoc b/doc/src/overview/creator-commercial-overview.qdoc
index a1e59b4c3a..ea1d7aa32f 100644
--- a/doc/src/overview/creator-commercial-overview.qdoc
+++ b/doc/src/overview/creator-commercial-overview.qdoc
@@ -42,7 +42,7 @@
\list
\li \l{Analyzing CPU Usage}{Performance Analyzer}
- \li \l{Browsing ISO 7000 Icons} in \QMLD
+ \li \l{Browsing ISO 7000 Icons} in the Design mode
\li \l{http://doc.qt.io/QtForDeviceCreation/index.html}{Developing for
embedded devices}
\li \l{http://doc.qt.io/qtcreator/creator-overview-qtasam.html}
diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-design-overview.qdoc
index bf2391db00..29c229c632 100644
--- a/doc/src/overview/creator-design-overview.qdoc
+++ b/doc/src/overview/creator-design-overview.qdoc
@@ -39,16 +39,16 @@
\image creator_designinguserinterface.png
- \QC provides two integrated visual editors, \QMLD and \QD. The integration
+ \QC provides integrated visual editors for designing Qt Quick and
+ widget-based applications in the Design mode. The integration
includes project management and code completion.
\list
\li \l{Developing Qt Quick Applications}
- You can use wizards to create Qt Quick projects that contain
- boiler-plate code. You can use \QMLD to develop Qt Quick
- applications in the \uicontrol Design mode.
+ You can use wizards to create Qt Quick projects containing
+ boiler-plate code that you can edit in the Design mode.
\li \l{Developing Widget Based Applications}
diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc
index 474657e989..f91f214c93 100644
--- a/doc/src/overview/creator-issues.qdoc
+++ b/doc/src/overview/creator-issues.qdoc
@@ -149,11 +149,11 @@
\endlist
- \section1 Qt Quick Designer Issues
+ \section1 Design Mode Issues
\list
- \li \QMLD uses a QML emulation layer (QML Puppet) to render and preview
+ \li The Design mode uses a QML emulation layer (QML Puppet) to render and preview
images and to collect data. Executing C++ code might cause the QML
emulation layer to crash. If it crashes, an error message is displayed and
you can continue editing the QML file in the code editor.
diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-overview.qdoc
index 9d2a60c6f7..def22ce883 100644
--- a/doc/src/overview/creator-overview.qdoc
+++ b/doc/src/overview/creator-overview.qdoc
@@ -64,7 +64,8 @@
\l{Managing Projects}.
\li \b {\l{Designing User Interfaces}}
- \QC provides two integrated visual editors, \QMLD and \QD.
+ \QC provides integrated visual editors for creating Qt Quick and
+ widget-based applications in the Design mode.
To create intuitive, modern-looking, fluid user interfaces, you
can use \l{Qt Quick}.
If you need a traditional user interface that is clearly
diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc
index 3105502677..65a151a753 100644
--- a/doc/src/overview/creator-tutorials.qdoc
+++ b/doc/src/overview/creator-tutorials.qdoc
@@ -47,7 +47,7 @@
\li \l{Creating a Qt Quick Application}
- Learn how to use \QMLD to create a Qt Quick application.
+ Learn how to use the Design mode to create a Qt Quick application.
\li \l{Creating a Qt Widget Based Application}
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 019ac432f3..991f409c50 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -90,7 +90,7 @@
files, as defined by the wizard.
For example, if you choose to create a Qt Quick application, \QC generates a
- QML file that you can modify with the integrated \QMLD.
+ QML file that you can modify in the Design mode.
\section1 Selecting Project Type
diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-projects-overview.qdoc
index acef8158eb..b002fae0e9 100644
--- a/doc/src/projects/creator-projects-overview.qdoc
+++ b/doc/src/projects/creator-projects-overview.qdoc
@@ -39,9 +39,9 @@
\image creator_managingprojects.png
- One of the major advantages of \QC is that it allows a team of developers
- to share a project across different development platforms with a common tool
- for development and debugging.
+ One of the major advantages of \QC is that it allows a team of designers and
+ developers to share a project across different development platforms with a
+ common tool for design, development, and debugging.
\list
@@ -55,21 +55,14 @@
\li \l{Using Version Control Systems}
The recommended way to set up a project is to use a version control
- system. Store and edit only project source files and build system
- configuration files (for example, .pro and .pri files for qmake).
- Do not store files generated by the build system or \QC, such as
- makefiles, .pro.user, and object files.
+ system. Store and edit only project source files and configuration
+ files. Do not store generated files.
\li \l{Configuring Projects}
- \QC allows you to specify separate build settings for each
- development platform. By default, \l{glossary-shadow-build}
- {shadow builds} are used to keep the build specific files separate
- from the source. You can create separate versions of project files
- to keep platform-dependent code separate. You can use qmake
- \l{Adding Platform Specific Source Files}
- {scopes} to select the file to process depending on which platform
- qmake is run on.
+ Installation programs and project wizards create default
+ configurations for \QC and your projects. You can modify
+ the settings in the Projects mode.
\li \l{Managing Sessions}
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 8eaf3dbb82..81471b2cc7 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -75,6 +75,11 @@
\uicontrol General, and enter a period (.) in the
\uicontrol {Default build directory} field.
+ You can create separate versions of project files to keep platform-dependent
+ code separate. You can use qmake \l{Adding Platform Specific Source Files}
+ {scopes} to select the file to process depending on which platform qmake is
+ run on.
+
\include creator-projects-cmake-building.qdocinc cmake build configuration
\section1 Starting External Processes
diff --git a/doc/src/qtcreator-toc.qdoc b/doc/src/qtcreator-toc.qdoc
index f9e3907665..0f30047180 100644
--- a/doc/src/qtcreator-toc.qdoc
+++ b/doc/src/qtcreator-toc.qdoc
@@ -87,9 +87,16 @@
\list
\li \l {Creating Qt Quick Projects}
\li \l {Qt Quick UI Forms}
- \li \l {Using Qt Quick Designer}
+ \li \l {Editing QML Files in Design Mode}
\li \l {Editing PathView Properties}
\li \l {Adding Connections}
+ \list
+ \li \l{Connecting Objects to Signals}
+ \li \l{Specifying Dynamic Properties}
+ \li \l{Adding Bindings Between Properties}
+ \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}
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index 5cdccee8fe..7c29421693 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -133,5 +133,8 @@
You can also join the \QC mailing list at:
\l{http://lists.qt-project.org/mailman/listinfo/}
{lists.qt-project.org Mailing Lists}.
+
+ For credits and a list of third-party libraries, see
+ \l {Acknowledgements}.
\endtable
*/
diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
index f0fddbacfd..f580ea7d06 100644
--- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
+++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc
@@ -78,12 +78,12 @@
The image appears in \uicontrol Resources. You can also use any other
image or a QML type, instead.
- To create the UI in the \uicontrol Design mode:
+ To create the UI in the Design mode:
\list 1
\li In the \uicontrol Projects view, double-click the \e Page1Form.ui.qml
- file to open it in \QMLD.
+ file to open it in the Design mode.
\li In the \uicontrol Navigator, select \uicontrol Label and press
\key Delete to delete it.
@@ -119,7 +119,8 @@
\endlist
We want to modify the properties of the bubble in ways that are not
- supported by \QMLD, and therefore we create a custom QML type for it:
+ supported in the Design mode, and therefore we create a custom QML
+ type for it:
\list 1
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index 8d373449e1..855f2c7150 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -50,10 +50,10 @@
(.ui.qml files). The forms use a purely declarative subset of the
QML language and you can edit them in the Design mode.
- \li \l {Using Qt Quick Designer}
+ \li \l {Editing QML Files in Design Mode}
You can use the \uicontrol {Form Editor} or the
- \uicontrol {Text Editor} of \QMLD in the \uicontrol Design mode to
+ \uicontrol {Text Editor} in the Design mode to
develop Qt Quick applications.
\li \l {Editing PathView Properties}
diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc
index 147df44a43..7809916e82 100644
--- a/doc/src/qtquick/qtquick-app-tutorial.qdoc
+++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc
@@ -48,8 +48,8 @@
\image qmldesigner-tutorial.png "States and transitions example"
- For more information about using \QMLD, see
- \l{Developing Qt Quick Applications}.
+ For more information about developing Qt Quick applications in the Design
+ mode, see \l{Developing Qt Quick Applications}.
For examples of using Qt Quick Controls 2, see
\l{Qt Quick Controls 2 Examples}.
@@ -69,7 +69,7 @@
\list 1
\li In the \uicontrol Projects view, double-click the \e Page1Form.ui.qml
- file to open it in \QMLD.
+ file to open it in the Design mode.
\image qmldesigner-tutorial-design-mode.png "Transitions project in Design Mode"
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 81897f0a5d..31af869be8 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -32,7 +32,7 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage qmldesigner-connections.html
+ \previouspage quick-states.html
\page quick-components.html
\nextpage quick-buttons.html
@@ -92,13 +92,13 @@
Qt Quick Controls 2 achieve improved efficiency by employing a simplified
\l {Styling Qt Quick Controls 2}{styling architecture} when compared to
- Qt Quick Controls, on which the module is based. \QMLD reads the
+ Qt Quick Controls, on which the module is based. The visual editor reads the
\c qtquickcontrols2.conf file that specifies the preferred style and some
style-specific arguments. To change the style, select another style from
the list on the toolbar. This enables you to check how your UI looks when
using the available styles.
- For an example of defining your own style and using it in \QMLD, see
+ For an example of defining your own style and using it in the Design mode, see
\l {Qt Quick Controls 2 - Flat Style}.
Qt Quick Controls 2 work in conjunction with Qt Quick and Qt Quick Layouts.
@@ -112,7 +112,7 @@
Some ready-made controls, such as a gauge, dial, status indicator, and
tumbler, are provided by the \l {Qt Quick Extras} module.
- \section1 Creating Components in Qt Quick Designer
+ \section1 Creating Components in Design Mode
\list 1
@@ -125,7 +125,7 @@
the \uicontrol Library only if the filename begins with a capital
letter.
- \li Click \uicontrol Design to open the .qml file in \QMLD.
+ \li Click \uicontrol Design to open the .qml file in the Design mode.
\li Drag and drop a QML type from the \uicontrol Library to the
\uicontrol Navigator or \uicontrol {Form Editor}.
diff --git a/doc/src/qtquick/qtquick-connection-editor-backend.qdoc b/doc/src/qtquick/qtquick-connection-editor-backend.qdoc
new file mode 100644
index 0000000000..5cd7b328f1
--- /dev/null
+++ b/doc/src/qtquick/qtquick-connection-editor-backend.qdoc
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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-property-bindings.html
+ \page quick-connections-backend.html
+ \nextpage quick-states.html
+
+ \title Managing C++ Backend Objects
+
+ Many applications provide QObject objects implemented in C++ that work as a
+ bridge between QML and C++. Such objects are typically registered with
+ \c qmlRegisterType or \c qmlRegisterSingletonType and then used by QML to
+ communicate with the C++ backend. Another example of such objects are the
+ state machines created by the \l {Using the Qt SCXML Compiler (qscxmlc)}
+ {Qt SCXML Compiler}.
+
+ Backend objects in a QML file are accessible if the QML file contains the
+ required imports. In addition, for a non-singleton QObject, a dynamic
+ property that contains the QObject must be specified.
+
+ A \e local QObject is instantiated in the current \e .qml file, as follows:
+
+ \badcode
+ property MyType myType: MyType {}.
+ \endcode
+
+ Otherwise the property is just defined, as follows:
+
+ \badcode
+ property MyType myType
+ \endcode
+
+ To manage backend objects:
+
+ \list 1
+
+ \li In the \uicontrol {Connections} view, select the
+ \uicontrol Backends tab to view accessible backend objects.
+ \image qmldesigner-backends.png
+ \li Select the \inlineimage plus.png
+ (\uicontrol Add) button to add a backend object in the
+ \uicontrol {Add New C++ Backend} dialog.
+ \li In the \uicontrol Type field, select the type of the backend QObject
+ to add.
+ \li Select the \uicontrol {Define object locally} check box if the
+ QObject is not registered as a singleton.
+ \li Select \uicontrol OK to add the required import and to create the
+ property for a non-singleton object.
+ \endlist
+*/
diff --git a/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc
new file mode 100644
index 0000000000..614a3841ea
--- /dev/null
+++ b/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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-dynamic-properties.html
+ \page quick-property-bindings.html
+ \nextpage quick-connections-backend.html
+
+ \title Adding Bindings Between Properties
+
+ To dynamically change the behavior of an object, you can create a \e binding
+ between the properties of two objects. To create a property binding, a
+ property is assigned a JavaScript expression that evaluates to the desired
+ value. At its simplest, a binding may be a reference to another property.
+ For example, the height of an object can be bound to the height of its
+ parent, so that when the parent height changes, the object height is
+ adjusted automatically.
+
+ For more information about the use of property bindings, see
+ \l{Property Binding}.
+
+ You can create bindings between objects in the \uicontrol Connections view.
+
+ \image qmldesigner-bindings.png
+
+ To bind a property of an object to the property of another object:
+
+ \list 1
+ \li In the \uicontrol {Connections} view, select the
+ \uicontrol {Bindings} tab.
+ \li Select the \inlineimage plus.png
+ (\uicontrol Add) button to add a binding.
+ \li Select \uicontrol Item to select the target object whose property
+ you want to change dynamically.
+ \li Select \uicontrol Property to select the property to bind to a
+ source property.
+ \li Select \uicontrol {Source Item} to select the object whose property
+ you want to use to determine the behavior of the target object.
+ \li Select \uicontrol {Source Property} to select the property to bind
+ the target property to.
+ \endlist
+*/
diff --git a/doc/src/qtquick/qtquick-connection-editor-properties.qdoc b/doc/src/qtquick/qtquick-connection-editor-properties.qdoc
new file mode 100644
index 0000000000..2288128327
--- /dev/null
+++ b/doc/src/qtquick/qtquick-connection-editor-properties.qdoc
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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 qmldesigner-connections.html
+ \page quick-dynamic-properties.html
+ \nextpage quick-property-bindings.html
+
+ \title Specifying Dynamic Properties
+
+ You can bind object properties to dynamic expressions to define global
+ properties for an object that can be read by other objects. For example,
+ you can specify global properties for the root object that you can use in
+ the child objects.
+
+ You can specify dynamic properties for objects in the
+ \uicontrol Connections view.
+
+ \image qmldesigner-dynamicprops.png
+
+ To specify dynamic properties for an object:
+
+ \list 1
+ \li In the \uicontrol {Connections} view, select the
+ \uicontrol {Properties} tab.
+ \li Select \uicontrol Item to select the object to specify the property
+ for.
+ \li Select \uicontrol Property to give a name to the property.
+ \li Select \uicontrol {Property Type} to specify the type of the
+ property.
+ \li Select \uicontrol {Property Value} to specify the value of the
+ property.
+ \endlist
+
+*/
diff --git a/doc/src/qtquick/qtquick-connection-editor-signals.qdoc b/doc/src/qtquick/qtquick-connection-editor-signals.qdoc
new file mode 100644
index 0000000000..010ab17847
--- /dev/null
+++ b/doc/src/qtquick/qtquick-connection-editor-signals.qdoc
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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.
+**
+****************************************************************************/
+
+/*!
+ \contentspage {Qt Creator Manual}
+ \previouspage qmldesigner-connections.html
+ \page quick-signals.html
+ \nextpage quick-dynamic-properties.html
+
+ \title Connecting Objects to Signals
+
+ To receive a notification when a particular signal is emitted for a
+ particular object, the object definition should declare a signal handler
+ named \e {on<Signal>} where \e {<Signal>} is the name of the signal, with
+ the first letter capitalized. The signal handler should contain the
+ JavaScript code to be executed when the signal handler is invoked.
+
+ QML types have predefined signals that are emitted when users interact with
+ the application. For example, the \l MouseArea type from the \l QtQuick
+ module has a \c clicked signal that is emitted whenever the mouse is
+ clicked within the area. Since the signal name is \c clicked, the signal
+ handler for receiving this signal is named \c onClicked.
+
+ For more information about signals and signal handlers, see
+ \l{Signal and Handler Event System}.
+
+ To access a signal outside of the object that emits it, you can use the
+ \l Connections type for connecting to signals of arbitrary objects. A
+ connections object can receive any signal from its specified target.
+ You can connect objects to signals that are available to them in the
+ \uicontrol Connections view.
+
+ \image qmldesigner-connections.png
+
+ To connect objects to signals:
+
+ \list 1
+ \li In the \uicontrol {Connections} view, select the
+ \uicontrol {Connections} tab.
+ \li Select the \inlineimage plus.png
+ (\uicontrol Add) button to add a connection.
+ \li Select \uicontrol Target to add the object to connect to a signal.
+ \li Select \uicontrol {Signal Handler} to select the signal that the
+ connection will listen to from a list of all signals available for
+ the object.
+ \li Select \uicontrol Actions to specify the action to perform when
+ the signal is emitted. You use JavaScript to specify the actions.
+ \endlist
+*/
diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc
index 92062021cf..aa25551bf9 100644
--- a/doc/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor.qdoc
@@ -27,153 +27,45 @@
\contentspage {Qt Creator Manual}
\previouspage qmldesigner-pathview-editor.html
\page qmldesigner-connections.html
- \nextpage quick-components.html
+ \nextpage quick-signals.html
\title Adding Connections
- You can use the \uicontrol {Connections} view to:
+ The user interface components and the application need to communicate with
+ each other. For example, a button needs to know that the user has clicked
+ on it. The button may then change color to indicate its state or perform an
+ action. Further, the application needs to know whether the user is clicking
+ the button, because it may need to relay this clicking event to other
+ applications.
+
+ QML has a signal and handler mechanism, that enables components to respond
+ to application events. Events are represented by \e signals. When a signal
+ is emitted, the corresponding \e {signal handler} is invoked to respond to
+ the event by using scripts or other operations placed in the handler.
+
+ To access a signal outside of the object that emits it, you can use the
+ \l Connections type for connecting to signals of arbitrary objects. A
+ Connections object can receive any signal from its specified target.
+
+ A component's property can be assigned a static value which stays constant
+ until it is explicitly assigned a new value. However, to make the fullest
+ use of QML and its built-in support for dynamic object behaviors, most QML
+ types use property bindings. This means that you can specify relationships
+ between different object properties so that when a property's sependencies
+ change in value, the property's value is automatically updated accordingly.
+
+ Behind the scenes, the QML engine monitors the property's dependencies (that
+ is, the variables in the binding expression). When a change is detected, the
+ QML engine re-evaluates the binding expression and applies the new result to
+ the property.
+
+ The following sections describe how to use the \uicontrol {Connections} view
+ to perform the following tasks:
\list
-
- \li Connect objects to signals.
-
- \li Specify dynamic properties for objects.
-
- \li Create bindings between the properties of two objects.
-
- \li Manage backend QObjects.
-
+ \li \l{Connecting Objects to Signals}
+ \li \l{Specifying Dynamic Properties}
+ \li \l{Adding Bindings Between Properties}
+ \li \l{Managing C++ Backend Objects}
\endlist
-
- For examples of adding connections, see
- \l{Creating Scalable Buttons and Borders}.
-
- \section1 Connecting Objects to Signals
-
- To connect objects to signals in QML, create \l{Connections} objects.
-
- \image qmldesigner-connections.png
-
- To create the connections:
-
- \list 1
-
- \li Select the \uicontrol {Connections} tab.
-
- \li Select the \inlineimage plus.png
- (\uicontrol Add) button to add a connection.
-
- \li Select \uicontrol Target to add the object to connect to a signal.
-
- \li Select \uicontrol {Signal Handler} to select the signal that the connection
- will listen to from a list of all signals available for the object.
-
- \li Select \uicontrol Actions to specify the action to perform when
- the signal is emitted. You use JavaScript to specify the actions.
-
- \endlist
-
- \section1 Specifying Dynamic Properties
-
- You can bind \l{Properties} to dynamic expressions to define global properties for an
- object that can be read by other objects. For example, you can specify
- global properties for the root object that you can use in the child objects.
-
- \image qmldesigner-dynamicprops.png
-
- To specify dynamic properties for an object:
-
- \list 1
-
- \li Select the \uicontrol {Properties} tab.
-
- \li Select \uicontrol Item to select the object to specify the property for.
-
- \li Select \uicontrol Property to give a name to the property.
-
- \li Select \uicontrol {Property Type} to specify the type of the property.
-
- \li Select \uicontrol {Property Value} to specify the value of the property.
-
- \endlist
-
- \section1 Adding Bindings Between Properties
-
- To dynamically change the behavior of an object, you can create a
- \l{Property Binding} between the properties of two objects.
-
- \image qmldesigner-bindings.png
-
- To bind a property of an object to the property of another object:
-
- \list 1
-
- \li Select the \uicontrol {Bindings} tab.
-
- \li Select the \inlineimage plus.png
- (\uicontrol Add) button to add a binding.
-
- \li Select \uicontrol Item to select the target object whose property you want
- to change dynamically.
-
- \li Select \uicontrol Property to select the property to bind to a source
- property.
-
- \li Select \uicontrol {Source Item} to select the object whose property you
- want to use to determine the behavior of the target object.
-
- \li Select \uicontrol {Source Property} to select the property to bind the
- target property to.
-
- \endlist
-
- \section1 Managing C++ Backend Objects
-
- Many applications provide QObject objects implemented in C++ that work as a
- bridge between QML and C++. Such objects are typically registered with
- qmlRegisterType or qmlRegisterSingletonType and then used by QML to
- communicate with the C++ backend. Another example of such objects are the
- state machines created by the \l {Using the Qt SCXML Compiler (qscxmlc)}
- {Qt SCXML Compiler}.
-
- Backend objects in a QML file are accessible if the QML file contains the
- required imports. In addition, for a non-singleton QObject, a dynamic
- property that contains the QObject must be specified.
-
- A \e local QObject is instantiated in the current \e .qml file, as follows:
-
- \badcode
- property MyType myType: MyType {}.
- \endcode
-
- Otherwise the property is just defined, as follows:
-
- \badcode
- property MyType myType
- \endcode
-
- To manage backend objects:
-
- \list 1
-
- \li Select the \uicontrol Backends tab to view accessible backend
- objects.
-
- \image qmldesigner-backends.png
-
- \li Select the \inlineimage plus.png
- (\uicontrol Add) button to add a backend object in the
- \uicontrol {Add New C++ Backend} dialog.
-
- \li In the \uicontrol Type field, select the type of the backend QObject
- to add.
-
- \li Select the \uicontrol {Define object locally} check box if the
- QObject is not registered as a singleton.
-
- \li Select \uicontrol OK to add the required import and to create the
- property for a non-singleton object.
-
- \endlist
-
*/
diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc
index 1dd045093f..db6397fa16 100644
--- a/doc/src/qtquick/qtquick-creating.qdoc
+++ b/doc/src/qtquick/qtquick-creating.qdoc
@@ -137,7 +137,8 @@
\endlist
- \QC generates a QML file, \e main.qml, that you can modify in \QMLD.
+ \QC generates a QML file, \e main.qml, that you can modify in the Design
+ mode.
\section1 Creating Qt Quick Controls 2 Applications
@@ -184,11 +185,11 @@
\endlist
For the Scroll application, \QC creates a QML file, \e main.qml, that you
- can modify in \QMLD.
+ can modify in the Design mode.
For the Stack and Swipe applications, \QC generates two UI files,
\e Page1Form.ui.qml and \e Page2Form.ui.qml, that you can modify in the
- \QMLD \uicontrol {Form Editor} and a QML file, \e main.qml, that you can
+ \uicontrol {Form Editor} and a QML file, \e main.qml, that you can
modify in the \uicontrol {Text Editor} to add the application logic.
\section1 Creating Qt Quick UI Projects
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index 8c835d12c0..753f02a538 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -35,16 +35,16 @@
\page creator-using-qt-quick-designer.html
\nextpage qmldesigner-pathview-editor.html
- \title Using Qt Quick Designer
+ \title Editing QML Files in Design Mode
- You can edit \l{Qt Quick UI Forms} (ui.qml files) in \QMLD. \QC opens the
- UI forms in the \uicontrol {Form Editor} tab in the \uicontrol Design mode.
- It is recommended that you use UI forms for components that you want to
- design in \QMLD.
+ \QC opens \l{Qt Quick UI Forms}{UI forms} (ui.qml files) in the
+ \uicontrol {Form Editor} tab in the Design mode. It is
+ recommended that you use UI forms for components that you want to
+ edit in the Design mode.
\image qmldesigner-visual-editor.png "Visual editor"
- Use \QMLD to manage your project:
+ To manage your project in the Design mode:
\list
@@ -93,7 +93,7 @@
\li \uicontrol {State} pane (6) displays the different states of the item.
QML states typically describe user interface configurations, such as
the UI controls, their properties and behavior and the available
- actions.
+ actions. For more information, see \l{Adding States}.
\endlist
@@ -170,9 +170,9 @@
\section2 Switching Parent Items
- When you drag and drop instances of QML types to the canvas, Qt Quick Designer
- adds the new item as a child of the item beneath it.
- When you move items on the canvas, Qt Quick Designer cannot determine
+ 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
@@ -307,7 +307,7 @@
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 {Qt Quick Designer}, and then select the
+ \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}.
@@ -321,19 +321,20 @@
\section2 Loading Placeholder Data
- \QMLD supports views, models, and delegates, so that when you add a Grid
- View, List View, or Path View item, the ListModel and the delegate
+ 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 for
- \QMLD. Specific models defined in C++ are the most obvious case. Often,
+ 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 \QMLD that references a C++ model, you see nothing on
+ 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.
@@ -387,8 +388,8 @@
}
\endqml
- This works nicely for applications but \QMLD displays a zero-sized item.
- A parent for the opened file does not exist, because the context is
+ 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,
@@ -425,70 +426,6 @@
\image qmldesigner-inline-editing.png
- \section1 Adding States
-
- User interfaces are designed to present different interface configurations
- in different scenarios, or to modify their appearances in response to user
- interaction. Often, there are a set of changes that are made concurrently,
- such that the interface could be seen to be internally changing from one
- \e state to another.
-
- This applies generally to interfaces regardless of their complexity.
- A photo viewer may initially present images in a grid, and when an image is
- clicked, change to a detailed state where the individual image is expanded
- and the interface is changed to present new options for image editing.
- On the other end of the scale, when a simple button is pressed, it may change
- to a \e pressed state in which its color and position is modified to give a
- pressed appearance.
-
- In QML, any item can change between different states to apply sets of
- changes that modify the properties of relevant items. Each state can present
- a different configuration that can, for example:
-
- \list
-
- \li Show some UI items and hide others.
-
- \li Present different available actions to the user.
-
- \li Start, stop or pause animations.
-
- \li Execute some script required in the new state.
-
- \li Change a property value for a particular item.
-
- \li Show a different view or screen.
-
- \endlist
-
- The \uicontrol State pane displays the different \l{State}{states}
- of the component in the Qt Quick Designer. The \uicontrol State pane is
- collapsed by default to save space. Select \uicontrol Expand in the context
- menu to view the whole pane.
-
- \image qmldesigner-transitions.png "State pane"
-
- To add states, click the \inlineimage plus.png
- button. Then modify the new state in the editor.
- For example, to change the appearance of a button, you can hide the button
- image and show another image in its place. Or, to add movement to the screen,
- you can change the position of an object on the canvas and then add animation
- to the change between the states.
-
- To determine when the state should be applied, select
- \uicontrol {Set when Condition} in the menu and specify a
- \l [QtQuick]{State::when}{when} property for the state.
-
- You can preview the states in the \uicontrol State pane and click them to switch
- between states on the canvas.
-
- For more information on using states, see \l{Creating Screens}.
-
- If you add animation to the states, you can run the application to test the
- animation.
-
- For more information on adding animation, see \l{Animating Screens}.
-
\section1 Working with QML Types on Canvas
You design applications on the canvas by placing items on it.
@@ -502,8 +439,9 @@
Click the \inlineimage snapping_and_anchoring.png
button to anchor the item to the items that you snap to.
- Choose \uicontrol {Tools > Options > Qt Quick > Qt Quick Designer} to specify
- settings for snapping. In the \uicontrol {Parent item padding} field, specify the
+ Choose \uicontrol Tools > \uicontrol Options > \uicontrol {Qt Quick} >
+ \uicontrol {\QMLD} to specify settings for snapping. In the
+ \uicontrol {Parent item padding} field, specify the
distance in pixels between the parent item and the snapping lines. In the
\uicontrol {Sibling item spacing} field, specify the distance in pixels between
sibling items and the snapping lines.
@@ -515,7 +453,7 @@
\section2 Hiding Item Boundaries
- \QMLD displays the boundaries of items on the canvas. To hide
+ The Design mode displays the boundaries of items on the canvas. To hide
the boundaries, click the \inlineimage boundingrect.png
button.
@@ -549,14 +487,14 @@
\section2 Specifying Canvas Size
- To change the canvas size, select \uicontrol {Tools > Options > Qt Quick
- > Qt Quick Designer} and
+ 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
- When you open QML files in \QMLD, the items in the file are drawn on
- the canvas. When you edit the item properties in \QMLD, the QML file and
+ 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
the image on the canvas might get out of sync. For example, when you change
the position of an item within a column or a row, the new position might
not be displayed correctly on the canvas.
diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/qtquick-exporting-qml.qdoc
index d9ad262c81..c4ecf06c01 100644
--- a/doc/src/qtquick/qtquick-exporting-qml.qdoc
+++ b/doc/src/qtquick/qtquick-exporting-qml.qdoc
@@ -66,7 +66,7 @@
development PC. Each layer is exported as an item.
You can open the QML file in \QC for editing. By default, the export scripts
- generate Qt Quick 1 files. To edit the files in \QMLD, change the import
+ generate Qt Quick 1 files. To edit the files in the Design mode, change the import
statements in the export scripts to import Qt Quick 2. Or, you can change
the import statement in each file after generating the files.
@@ -146,8 +146,8 @@
On Linux, run the following command: \c {chmod u+rx}
- \li To generate QML files that you can edit in \QMLD, edit the import
- statement in \e qmlexporter.py. For example:
+ \li To generate QML files that you can edit in the Design mode, edit the
+ import statement in \e qmlexporter.py. For example:
\code
f.write('import QtQuick 2.5\n')
diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
index 816c6c934d..b3b70c0013 100644
--- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
+++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
@@ -43,7 +43,7 @@
information for code completion and the semantic checks to work correctly.
To create a QML module and make it appear in the \uicontrol Library in
- \QMLD:
+ the Design mode:
\list 1
@@ -69,15 +69,15 @@
.pro file: \c {QML_IMPORT_PATH += path/to/module}.
For more information, see \l {Importing QML Modules}.
- \li Make sure that the QML emulation layer of \QMLD is built with
+ \li Make sure that the QML emulation layer used in the Design mode is built with
the same Qt version as your QML modules. For more information, see
- \l {Running QML Modules in Qt Quick Designer}. You can also try
+ \l {Running QML Modules in Design Mode}. You can also try
skipping this step and take it later, if necessary.
\endlist
Your module should now appear in the \uicontrol Imports tab in the
- \uicontrol Library in \QMLD. Your components should appear in the
+ \uicontrol Library in the Design mode. Your components should appear in the
\uicontrol {QML Types} tab if a valid \c .metainfo file is in place.
\section1 Registering QML Types
@@ -93,7 +93,7 @@
for QML modules with plugins before distributing them.
Classes registered with \c qmlRegisterType() can be used as backend objects
- in the \QMLD. For more information, see \l {Adding Connections}.
+ in the Design mode. For more information, see \l {Adding Connections}.
\section1 Generating qmltypes Files
@@ -150,10 +150,10 @@
The import path affects all the targets built by the CMake project.
- \section1 Running QML Modules in Qt Quick Designer
+ \section1 Running QML Modules in Design Mode
- \QMLD uses a QML emulation layer (also called QML Puppet) to render and
- preview images and to collect data. To be able to render custom types
+ A QML emulation layer (also called QML Puppet) is used in the Design mode to
+ render and preview images and to collect data. To be able to render custom types
correctly from QML modules, the emulation layer must be built with the same
Qt version as the QML modules.
@@ -163,20 +163,21 @@
To use an emulation layer that is built with the Qt
configured in the build and run kit for the project, select \uicontrol Tools >
- \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} >
+ \uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {\QMLD} >
\uicontrol {Use QML emulation layer which is built by the selected Qt} radio button.
- \QC builds the emulation layer when you select the \uicontrol Design mode.
+ \QC builds the emulation layer when you select the Design mode.
A plugin should behave differently depending on whether it is run by the
emulation layer or an application. For example, animations should not be run
- in the \uicontrol Design mode. You can use the value of the QML_PUPPET_MODE
+ in the Design mode. You can use the value of the QML_PUPPET_MODE
environment variable to check whether the plugin is currently being run
- by an application or edited in the \uicontrol Design mode.
+ by an application or edited in the Design mode.
- If you want to use a different module in \QMLD than in your actual
+ If you want to use a different module in the Design mode than in your actual
application for example to mockup C++ items, then you can use \c{QML_DESIGNER_IMPORT_PATH}
in the \c{.pro} file.
- Modules in the import paths defined in \c{QML_DESIGNER_IMPORT_PATH} will be used only in \QMLD.
+ Modules in the import paths defined in \c{QML_DESIGNER_IMPORT_PATH} will be
+ used only in the Design mode.
For an example, see \l {Qt Quick Controls 2 - Contact List}.
*/
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 17dd3c2d39..fd035049ca 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -120,8 +120,8 @@
Property bindings are created implicitly in QML whenever a property is
assigned a JavaScript expression. To set JavaScript expressions as values of
- properties in \QMLD, click the circle icon next to a property to open a
- context menu, and select \uicontrol {Set Binding}.
+ 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"
@@ -141,7 +141,8 @@
For more information on the JavaScript environment provided by QML, see
\l{Integrating QML and JavaScript}.
- Bindings are a black box for \QMLD and using them might have a negative impact on
+ 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.
@@ -167,8 +168,8 @@
(\uicontrol {Reset Anchors}) button to reset the anchors to their saved
state.
- Specifying the baseline anchor in \QMLD is not supported. You can specify it
- in the \uicontrol {Text Editor}.
+ 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
@@ -393,9 +394,9 @@
\section2 Using SCXML State Machines
- To use QML and \QMLD together with an SCXML state machine, add states and
- bind them to the state machine in the \uicontrol Backends tab, as described
- in \l {Managing C++ Backend Objects}.
+ 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,
diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/src/qtquick/qtquick-states.qdoc
new file mode 100644
index 0000000000..80316aaa4f
--- /dev/null
+++ b/doc/src/qtquick/qtquick-states.qdoc
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** 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-connections-backend.html
+ \page quick-states.html
+ \nextpage quick-components.html
+
+ \title Adding States
+
+ User interfaces are designed to present different interface configurations
+ in different scenarios, or to modify their appearances in response to user
+ interaction. Often, there are a set of changes that are made concurrently,
+ such that the interface could be seen to be internally changing from one
+ \e state to another.
+
+ This applies generally to interfaces regardless of their complexity. A photo
+ viewer may initially present images in a grid, and when an image is clicked,
+ change to a detailed state where the individual image is expanded and the
+ interface is changed to present new options for image editing. At the other
+ end of the scale, when a button is pressed, it may change to a
+ \e pressed state in which its color and position are modified so that it
+ appears to be pressed down.
+
+ In QML, any item can change between different states to apply sets of
+ changes that modify the properties of relevant items. Each state can
+ present a different configuration that can, for example:
+
+ \list
+ \li Show some UI items and hide others.
+ \li Present different available actions to the user.
+ \li Start, stop or pause animations.
+ \li Execute some script required in the new state.
+ \li Change a property value for a particular item.
+ \li Show a different view or screen.
+ \endlist
+
+ The \uicontrol State pane displays the different \l{State}{states}
+ of the component in the Design mode. The \uicontrol State pane is
+ collapsed by default to save space. Select \uicontrol Expand in
+ the context menu to view the whole pane.
+
+ \image qmldesigner-transitions.png "State pane"
+
+ To add states, click the \inlineimage plus.png
+ button. Then modify the new state in the editor. For example, to change the
+ appearance of a button, you can hide the button image and show another image
+ in its place. Or, to add movement to the screen, you can change the position
+ of an object on the canvas and then add animation to the change between the
+ states.
+
+ To determine when the state should be applied, select
+ \uicontrol {Set when Condition} in the menu and specify a
+ \l [QtQuick]{State::when}{when} property for the state.
+
+ 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}.
+
+ If you add animation to the states, you can run the application to test the
+ animation.
+
+ For more information about adding animation, see \l{Animating Screens}.
+*/
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index fc771930d3..117f5fcfdd 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -990,7 +990,7 @@ class Dumper(DumperBase):
if self.isWindowsTarget():
qtCoreMatch = re.match('.*Qt5?Core[^/.]*d?\.dll', name)
else:
- qtCoreMatch = re.match('.*/libQt5?Core[^/.]\.so', name)
+ qtCoreMatch = re.match('.*/libQt5?Core[^/.]*\.so', name)
if qtCoreMatch is not None:
self.handleQtCoreLoaded(objfile)
diff --git a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
index 4742c51070..84509537cf 100644
--- a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
+++ b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
@@ -131,6 +131,14 @@
"QtQuick 2.8",
"QtQuick 2.9",
"QtTest 1.0",
+ "QtWebEngine 1.0",
+ "QtWebEngine 1.1",
+ "QtWebEngine 1.2",
+ "QtWebEngine 1.3",
+ "QtWebEngine 1.4",
+ "QtWebEngine 1.5",
+ "QtWebEngine 1.6",
+ "QtWebEngine 1.7",
"QtWebKit 3.0",
"Enginio 1.0"
]
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 5770974f8a..d87d7c5887 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -16,6 +16,33 @@
</message>
</context>
<context>
+ <name>AddImageToResources</name>
+ <message>
+ <source>File Name</source>
+ <translation>Имя файла</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>Размер</translation>
+ </message>
+ <message>
+ <source>Add Resources</source>
+ <translation>Добавление ресурсов</translation>
+ </message>
+ <message>
+ <source>&amp;Browse...</source>
+ <translation>&amp;Обзор...</translation>
+ </message>
+ <message>
+ <source>Target Directory</source>
+ <translation>Каталог назначения</translation>
+ </message>
+ <message>
+ <source>In directory:</source>
+ <translation>В каталоге:</translation>
+ </message>
+</context>
+<context>
<name>AddSignalHandlerDialog</name>
<message>
<source>Implement Signal Handler</source>
@@ -257,6 +284,41 @@ The minimum API level required by the kit is %1.</source>
</message>
</context>
<context>
+ <name>Android::AndroidRunConfiguration</name>
+ <message>
+ <source>Activity manager start options:</source>
+ <translation>Параметры запуска менеджера действий:</translation>
+ </message>
+ <message>
+ <source>Shell commands to run on Android device before application launch.</source>
+ <translation>Команды среды, запускаемые на устройстве Android до запуска приложения.</translation>
+ </message>
+ <message>
+ <source>Shell commands to run on Android device after application quits.</source>
+ <translation>Команды среды, запускаемые на устройстве Android после завершения приложения.</translation>
+ </message>
+ <message>
+ <source>If the &quot;am start&quot; options conflict, the application might not start.</source>
+ <translation>Если есть конфликт параметров для «am start», то приложение может не запуститься.</translation>
+ </message>
+ <message>
+ <source>Android run settings</source>
+ <translation>Настройки запуска Android</translation>
+ </message>
+ <message>
+ <source>The project file &quot;%1&quot; is currently being parsed.</source>
+ <translation>Идёт обработка файла проекта «%1».</translation>
+ </message>
+ <message>
+ <source>The project file &quot;%1&quot; does not exist.</source>
+ <translation>Файл проекта «%1» отсутствует.</translation>
+ </message>
+ <message>
+ <source>The project file &quot;%1&quot; could not be parsed.</source>
+ <translation>Не удалось разобрать файл проекта «%1».</translation>
+ </message>
+</context>
+<context>
<name>Android::Internal::AddNewAVDDialog</name>
<message>
<source>Create new AVD</source>
@@ -284,6 +346,21 @@ The minimum API level required by the kit is %1.</source>
</message>
</context>
<context>
+ <name>Android::Internal::AndroidAvdManager</name>
+ <message>
+ <source>AVD Start Error</source>
+ <translation>Ошибка запуска AVD</translation>
+ </message>
+ <message>
+ <source>Emulator Tool Is Missing</source>
+ <translation>Утилита эмуляции отсутствует</translation>
+ </message>
+ <message>
+ <source>Install the missing emulator tool (%1) to the installed Android SDK.</source>
+ <translation>Установите отсутствующую утилиту эмуляции (%1) в установленный Android SDK.</translation>
+ </message>
+</context>
+<context>
<name>Android::Internal::AndroidCreateKeystoreCertificate</name>
<message>
<source>&lt;span style=&quot; color:#ff0000;&quot;&gt;Keystore password is too short&lt;/span&gt;</source>
@@ -818,62 +895,51 @@ Do you want to uninstall the existing package?</source>
</message>
</context>
<context>
- <name>Android::Internal::AndroidRunConfigurationWidget</name>
+ <name>Android::Internal::AndroidRunner</name>
<message>
- <source>Form</source>
- <translation></translation>
+ <source>&quot;%1&quot; terminated.</source>
+ <translation>«%1» завершён.</translation>
</message>
+</context>
+<context>
+ <name>Android::Internal::AndroidRunnerWorker</name>
<message>
- <source>Activity manager start options:</source>
- <translation>Параметры запуска менеджера действий:</translation>
+ <source>No free ports available on host for QML debugging.</source>
+ <translation>Нет свободных портов на компьютере для отладки QML.</translation>
</message>
<message>
- <source>If the &quot;am start&quot; options conflict, the application might not start.</source>
- <translation>Если есть конфликт параметров для «am start», то приложение может не запуститься.</translation>
+ <source>Failed to get process path. Reason: %1.</source>
+ <translation>Не удалось получить путь процесса. Причина: %1.</translation>
</message>
<message>
- <source>Shell commands to run on Android device before application launch.</source>
- <translation>Команды среды запускаемые на устройстве Android до запуска приложения.</translation>
+ <source>Cannot find C++ debugger.</source>
+ <translation>Не удалось найти отладчик C++.</translation>
</message>
<message>
- <source>Shell commands to run on Android device after application quits.</source>
- <translation>Команды среды запускаемые на устройстве Android после завершения приложения.</translation>
+ <source>Failed to start C++ debugger.</source>
+ <translation>Не удалось запустить отладчик C++.</translation>
</message>
<message>
- <source>Android run settings</source>
- <translation>Настройки запуска Android</translation>
+ <source>Failed to forward jdb debugging ports. Reason: %1.</source>
+ <translation>Не удалось перенаправить отладочные порты jdb. Причина: %1.</translation>
</message>
-</context>
-<context>
- <name>Android::Internal::AndroidRunner</name>
<message>
- <source>&quot;%1&quot; terminated.</source>
- <translation>«%1» завершён.</translation>
+ <source>Failed to start jdb</source>
+ <translation>Не удалось запустить jdb</translation>
</message>
-</context>
-<context>
- <name>Android::Internal::AndroidRunnerWorker</name>
<message>
- <source>No free ports available on host for QML debugging.</source>
- <translation>Нет свободных портов на компьютере для отладки QML.</translation>
+ <source>Cannot attach jdb to the running application</source>
+ <translation>Не удалось подключить jdb к работающему приложению</translation>
</message>
<message>
<source>&quot;%1&quot; died.</source>
<translation>«%1» аварийно завершился.</translation>
</message>
<message>
- <source>Unable to start &quot;%1&quot;.</source>
- <translation>Не удалось запустить «%1».</translation>
- </message>
- <message>
<source>Failed to forward C++ debugging ports. Reason: %1.</source>
<translation>Не удалось пробросить порты отладки С++: %1.</translation>
</message>
<message>
- <source>Failed to forward ping pong ports. Reason: %1.</source>
- <translation>Не удалось пробросить порты ping pong: %1.</translation>
- </message>
- <message>
<source>Failed to forward QML debugging ports. Reason: %1.</source>
<translation>Не удалось пробросить порты отладки QML: %1.</translation>
</message>
@@ -881,10 +947,6 @@ Do you want to uninstall the existing package?</source>
<source>Failed to start the activity. Reason: %1.</source>
<translation>Не удалось запустить activity: %1.</translation>
</message>
- <message>
- <source>Failed to contact debugging port.</source>
- <translation>Не удалось подключиться к порту отладки.</translation>
- </message>
</context>
<context>
<name>Android::Internal::AndroidSdkManager</name>
@@ -1339,10 +1401,6 @@ Install an SDK of at least API version %1.</source>
<context>
<name>AndroidBuildApkWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Sign package</source>
<translation>Подписывание пакета</translation>
</message>
@@ -1491,10 +1549,6 @@ Install an SDK of at least API version %1.</source>
<context>
<name>AndroidDeployQtWidget</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>Clean Temporary Libraries Directory on Device</source>
<translation>Очистить временный каталог на устройстве</translation>
</message>
@@ -1516,13 +1570,6 @@ Install an SDK of at least API version %1.</source>
</message>
</context>
<context>
- <name>AndroidPackageInstallationFactory</name>
- <message>
- <source>Deploy to device</source>
- <translation>Установка на устройство</translation>
- </message>
-</context>
-<context>
<name>AndroidSdkManager</name>
<message>
<source>Updating installed packages.</source>
@@ -1723,6 +1770,18 @@ Install an SDK of at least API version %1.</source>
<translation>Alt+Shift+T,Alt+R</translation>
</message>
<message>
+ <source>Run Tests for Current &amp;File</source>
+ <translation>Запустить тесты для текущего &amp;файла</translation>
+ </message>
+ <message>
+ <source>Run Tests for Current File</source>
+ <translation>Запуск тестов для текущего файла</translation>
+ </message>
+ <message>
+ <source>Alt+Shift+T,Alt+F</source>
+ <translation>Alt+Shift+T,Alt+F</translation>
+ </message>
+ <message>
<source>Re&amp;scan Tests</source>
<translation>&amp;Пересканировать</translation>
</message>
@@ -1730,10 +1789,30 @@ Install an SDK of at least API version %1.</source>
<source>Alt+Shift+T,Alt+S</source>
<translation>Alt+Shift+T,Alt+S</translation>
</message>
+ <message>
+ <source>&amp;Run Test Under Cursor</source>
+ <translation>&amp;Запустить тест под курсором</translation>
+ </message>
+ <message>
+ <source>&amp;Debug Test Under Cursor</source>
+ <translation>&amp;Отладить тест под курсором</translation>
+ </message>
+ <message>
+ <source>Selected test was not found (%1).</source>
+ <translation>Не удалось найти выбранный тест (%1).</translation>
+ </message>
</context>
<context>
<name>Autotest::Internal::GTestOutputReader</name>
<message>
+ <source>Running tests failed.
+ %1
+Executable: %2</source>
+ <translation>Запущенные тесты завершились ошибкой.
+ %1
+Программа: %2</translation>
+ </message>
+ <message>
<source>(iteration %1)</source>
<translation>(итерация %1)</translation>
</message>
@@ -1769,10 +1848,6 @@ Install an SDK of at least API version %1.</source>
<context>
<name>Autotest::Internal::GTestSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Break on failure while debugging</source>
<translation>Останавливаться при ошибках</translation>
</message>
@@ -1824,6 +1899,32 @@ Install an SDK of at least API version %1.</source>
<source>Shuffles tests automatically on every iteration by the given seed.</source>
<translation>Перемешивает тесты автоматически на каждой итерации по заданному числу.</translation>
</message>
+ <message>
+ <source>Group mode:</source>
+ <translation>Режим группировки:</translation>
+ </message>
+ <message>
+ <source>Active filter:</source>
+ <translation>Активный фильтр:</translation>
+ </message>
+ <message>
+ <source>Select on what grouping the tests should be based.</source>
+ <translation>Выберите основание для группировки тестов.</translation>
+ </message>
+ <message>
+ <source>Directory</source>
+ <translation>Каталог</translation>
+ </message>
+ <message>
+ <source>GTest Filter</source>
+ <translation>Фильтр GTest</translation>
+ </message>
+ <message>
+ <source>Set the GTest filter to be used for grouping.
+See Google Test documentation for further information on GTest filters.</source>
+ <translation>Задайте фильтр GTest для группировки.
+Информацию о GTest фильтрах смотрите в документации Google Test.</translation>
+ </message>
</context>
<context>
<name>Autotest::Internal::QtTestOutputReader</name>
@@ -1856,6 +1957,10 @@ Install an SDK of at least API version %1.</source>
<translation>Версия QTest: %1</translation>
</message>
<message>
+ <source>XML parsing failed.</source>
+ <translation>Не удалось разобрать XML.</translation>
+ </message>
+ <message>
<source>Test function finished.</source>
<translation>Тестовая функция завершена.</translation>
</message>
@@ -1875,10 +1980,6 @@ Install an SDK of at least API version %1.</source>
<context>
<name>Autotest::Internal::QtTestSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Enables interrupting tests on assertions.</source>
<translation>Влючение прерывания тестов на утверждениях.</translation>
</message>
@@ -2254,7 +2355,7 @@ Check the test environment.</source>
</message>
<message>
<source>No test cases left for execution. Canceling test run.</source>
- <translation>Не осталось больше тестов для запуска. Запуск отменён.</translation>
+ <translation>Не осталось больше тестов для запуска. Выполнение теста отменяется.</translation>
</message>
<message>
<source>Could not find command &quot;%1&quot;. (%2)</source>
@@ -2267,8 +2368,12 @@ Maybe raise the timeout?</source>
Может его увеличить?</translation>
</message>
<message>
+ <source>Current kit has changed. Canceling test run.</source>
+ <translation>Изменился текущий комплект. Выполнение теста отменяется.</translation>
+ </message>
+ <message>
<source>No tests selected. Canceling test run.</source>
- <translation>Тесты не выбраны. Отмена теста.</translation>
+ <translation>Тесты не выбраны. Выполнение теста отменяется.</translation>
</message>
<message>
<source>Project is null. Canceling test run.
@@ -2278,7 +2383,11 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop
</message>
<message>
<source>Project is not configured. Canceling test run.</source>
- <translation>Проект не настроен. Отмена теста.</translation>
+ <translation>Проект не настроен. Выполнение теста отменяется.</translation>
+ </message>
+ <message>
+ <source>Startup project has changed. Canceling test run.</source>
+ <translation>Изменился запускающий проект. Выполнение теста отменяется.</translation>
</message>
<message>
<source>Running Tests</source>
@@ -2300,16 +2409,12 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop
</message>
<message>
<source>Build failed. Canceling test run.</source>
- <translation>Сборка не удалась. Отмена теста.</translation>
+ <translation>Сборка не удалась. Выполнение теста отменяется.</translation>
</message>
</context>
<context>
<name>Autotest::Internal::TestSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>General</source>
<translation>Основное</translation>
</message>
@@ -2642,25 +2747,22 @@ Warning: this is an experimental feature and might lead to failing to execute th
</message>
</context>
<context>
- <name>BareMetal::Internal::BareMetalCustomRunConfigWidget</name>
+ <name>BareMetal::Internal::BareMetalCustomRunConfiguration</name>
<message>
- <source>Executable:</source>
- <translation>Программа:</translation>
+ <source>Unknown</source>
+ <translation>Неизвестно</translation>
</message>
<message>
- <source>Work directory:</source>
- <translation>Рабочий каталог:</translation>
+ <source>Custom Executable)</source>
+ <translation>Особое приложение</translation>
</message>
-</context>
-<context>
- <name>BareMetal::Internal::BareMetalCustomRunConfiguration</name>
<message>
<source>The remote executable must be set in order to run a custom remote run configuration.</source>
<translation>Для запуска внешнего приложения его необходимо задать.</translation>
</message>
<message>
- <source>Custom Executable (on GDB server or hardware debugger)</source>
- <translation>Особое приложение (через сервер GDB или аппаратный отладчик)</translation>
+ <source>Custom Executable</source>
+ <translation>Особая программа</translation>
</message>
</context>
<context>
@@ -2670,6 +2772,10 @@ Warning: this is an experimental feature and might lead to failing to execute th
<translation>Отладка невозможна: отсутствует устройство в комплекте.</translation>
</message>
<message>
+ <source>No GDB server provider found for %1</source>
+ <translation>Провайдер GDB сервера для %1 не найден</translation>
+ </message>
+ <message>
<source>Cannot debug: Local executable is not set.</source>
<translation>Отладка невозможна: локальная программа не задана.</translation>
</message>
@@ -2742,39 +2848,8 @@ Warning: this is an experimental feature and might lead to failing to execute th
<context>
<name>BareMetal::Internal::BareMetalRunConfiguration</name>
<message>
- <source>%1 (via GDB server or hardware debugger)</source>
- <translation>%1 (через сервер GDB или аппаратный отладчик)</translation>
- </message>
- <message>
- <source>Run on GDB server or hardware debugger</source>
- <extracomment>Bare Metal run configuration default run name</extracomment>
- <translation>Запуск через сервер GDB или аппаратный отладчик</translation>
- </message>
-</context>
-<context>
- <name>BareMetal::Internal::BareMetalRunConfigurationFactory</name>
- <message>
- <source>%1 (on GDB server or hardware debugger)</source>
- <translation>%1 (через сервер GDB или аппаратный отладчик)</translation>
- </message>
-</context>
-<context>
- <name>BareMetal::Internal::BareMetalRunConfigurationWidget</name>
- <message>
- <source>Executable:</source>
- <translation>Программа:</translation>
- </message>
- <message>
- <source>&lt;default&gt;</source>
- <translation>&lt;по умолчанию&gt;</translation>
- </message>
- <message>
- <source>Working directory:</source>
- <translation>Рабочий каталог:</translation>
- </message>
- <message>
<source>Unknown</source>
- <translation>Неизвестное</translation>
+ <translation>Неизвестно</translation>
</message>
</context>
<context>
@@ -3374,10 +3449,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo
<context>
<name>Bazaar::Internal::OptionsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Configuration</source>
<translation>Настройка</translation>
</message>
@@ -3632,10 +3703,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>Beautifier::Internal::ArtisticStyle::ArtisticStyleOptionsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Configuration</source>
<translation>Настройка</translation>
</message>
@@ -3762,10 +3829,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>Beautifier::Internal::ClangFormat::ClangFormatOptionsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Configuration</source>
<translation>Настройка</translation>
</message>
@@ -3827,10 +3890,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>Beautifier::Internal::ConfigurationPanel</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Edit</source>
<translation>Изменить</translation>
</message>
@@ -3854,10 +3913,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>Beautifier::Internal::GeneralOptionsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Automatic Formatting on File Save</source>
<translation>Автоматическое форматирование при сохранении</translation>
</message>
@@ -3896,10 +3951,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>Beautifier::Internal::Uncrustify::UncrustifyOptionsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Configuration</source>
<translation>Настройка</translation>
</message>
@@ -3972,7 +4023,7 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
</message>
</context>
<context>
- <name>BinEditor::Internal::BinEditorPlugin</name>
+ <name>BinEditor::Internal::BinEditorPluginPrivate</name>
<message>
<source>&amp;Undo</source>
<translation>&amp;Отменить</translation>
@@ -4599,6 +4650,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<translation>Программа cmake не указана.</translation>
</message>
<message>
+ <source>No compilers set in kit.</source>
+ <translation>У комплекта не заданы компиляторы.</translation>
+ </message>
+ <message>
<source>Scan &quot;%1&quot; project tree</source>
<translation>Сканирование дерева проекта «%1»</translation>
</message>
@@ -4706,6 +4761,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<translation>Не удалось создать временный каталог «%1».</translation>
</message>
<message>
+ <source>The kit needs to define a CMake tool to parse this project.</source>
+ <translation>В комплекте должна быть задана утилита CMake для разбора этого проекта.</translation>
+ </message>
+ <message>
<source>CMakeCache.txt file not found.</source>
<translation>Не удалось найти файл CMakeCache.txt.</translation>
</message>
@@ -5058,27 +5117,42 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>CMakeProjectManager::Internal::CMakeRunConfiguration</name>
<message>
- <source>Run CMake kit</source>
- <translation>Запуск комплекта CMake</translation>
- </message>
- <message>
<source>The project no longer builds the target associated with this run configuration.</source>
<translation>Проект больше не собирает цель, ассоциированную с ним в конфигурации запуска.</translation>
</message>
</context>
<context>
- <name>CMakeProjectManager::Internal::CMakeRunConfigurationWidget</name>
+ <name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
<message>
- <source>Executable:</source>
- <translation>Программа:</translation>
+ <source>CMake</source>
+ <translation>CMake</translation>
</message>
+</context>
+<context>
+ <name>CMakeProjectManager::Internal::CMakeSpecificSettingForm</name>
<message>
- <source>&lt;unknown&gt;</source>
- <translation>&lt;неизвестная&gt;</translation>
+ <source>Determines whether file paths are copied to the clipboard for pasting to the CMakeLists.txt file when you add new files to CMake projects.</source>
+ <translation>Определяет, будут ли копироваться в буфер обмена пути файлов для вставки в файл CMakeLists.txt при добавлении их в проект CMake.</translation>
+ </message>
+ <message>
+ <source>Adding Files</source>
+ <translation>Добавление файлов</translation>
+ </message>
+ <message>
+ <source>Ask about copying file paths</source>
+ <translation>Спрашивать о копировании файловых путей</translation>
+ </message>
+ <message>
+ <source>Do not copy file paths</source>
+ <translation>Не копировать</translation>
+ </message>
+ <message>
+ <source>Copy file paths</source>
+ <translation>Копировать</translation>
</message>
</context>
<context>
- <name>CMakeProjectManager::Internal::CMakeSettingsPage</name>
+ <name>CMakeProjectManager::Internal::CMakeSpecificSettingsPage</name>
<message>
<source>CMake</source>
<translation>CMake</translation>
@@ -5323,17 +5397,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
</message>
</context>
<context>
- <name>CPlusPlus::OverviewModel</name>
- <message>
- <source>&lt;Select Symbol&gt;</source>
- <translation>&lt;Выберите символ&gt;</translation>
- </message>
- <message>
- <source>&lt;No Symbols&gt;</source>
- <translation>&lt;Нет символов&gt;</translation>
- </message>
-</context>
-<context>
<name>CPlusplus::CheckSymbols</name>
<message>
<source>Only virtual functions can be marked &apos;override&apos;</source>
@@ -5405,6 +5468,17 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
</message>
</context>
<context>
+ <name>ClangCodeModel</name>
+ <message>
+ <source>&lt;No Symbols&gt;</source>
+ <translation>&lt;Нет символов&gt;</translation>
+ </message>
+ <message>
+ <source>&lt;Select Symbol&gt;</source>
+ <translation>&lt;Выберите символ&gt;</translation>
+ </message>
+</context>
+<context>
<name>ClangCodeModel::Internal::BackendCommunicator</name>
<message>
<source>Clang Code Model: Error: The clangbackend executable &quot;%1&quot; does not exist.</source>
@@ -5420,6 +5494,13 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
</message>
</context>
<context>
+ <name>ClangCodeModel::Internal::ClangCodeModelPlugin</name>
+ <message>
+ <source>Clang Code Model</source>
+ <translation>Модель кода Clang</translation>
+ </message>
+</context>
+<context>
<name>ClangCodeModel::Internal::ClangCompletionAssistProcessor</name>
<message>
<source>Location: %1</source>
@@ -5437,10 +5518,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<context>
<name>ClangCodeModel::Internal::ClangProjectSettingsWidget</name>
<message>
- <source>Warnings</source>
- <translation>Предупреждения</translation>
- </message>
- <message>
<source>Clang Code Model</source>
<translation>Модель кода Clang</translation>
</message>
@@ -5453,10 +5530,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
<translation>Особые</translation>
</message>
<message>
- <source>General</source>
- <translation>Основное</translation>
- </message>
- <message>
<source>Parse templates in a MSVC-compliant way. This helps to parse headers for example from Active Template Library (ATL) or Windows Runtime Library (WRL).
However, using the relaxed and extended rules means also that no highlighting/completion can be provided within template functions.</source>
<translation>Разбирать шаблоны как MSVC. Это поможет разобрать заголовки, например из Active Template Library (ATL) и Windows Runtime Library (WRL).
@@ -5478,16 +5551,32 @@ However, using the relaxed and extended rules means also that no highlighting/co
<context>
<name>ClangDiagnosticConfigsModel</name>
<message>
- <source>Warnings for questionable constructs</source>
- <translation>Предупреждать о сомнительных конструкциях</translation>
+ <source>Clang-only checks for questionable constructs</source>
+ <translation>Проверки Clang для сомнительных конструкций</translation>
+ </message>
+ <message>
+ <source>Clang-only pedantic checks</source>
+ <translation>Педантичные проверки Clang</translation>
</message>
<message>
- <source>Pedantic Warnings</source>
- <translation>Педантичные предупреждения</translation>
+ <source>Clang-only checks for almost everything</source>
+ <translation>Проверки Clang для всего</translation>
</message>
<message>
- <source>Warnings for almost everything</source>
- <translation>Предупреждать обо всём</translation>
+ <source>Clang-Tidy thorough checks</source>
+ <translation>Тщательные проверки Clang-Tidy</translation>
+ </message>
+ <message>
+ <source>Clang-Tidy static analyzer checks</source>
+ <translation>Проверки статическим анализатором Clang-Tidy</translation>
+ </message>
+ <message>
+ <source>Clazy level0 checks</source>
+ <translation>Проверки Clazy level0</translation>
+ </message>
+ <message>
+ <source>Clang-Tidy and Clazy preselected checks</source>
+ <translation>Выбранные проверки Clang-Tidy и Clazy</translation>
</message>
<message>
<source>%1 [built-in]</source>
@@ -5495,6 +5584,17 @@ However, using the relaxed and extended rules means also that no highlighting/co
</message>
</context>
<context>
+ <name>ClangDiagnosticWidget</name>
+ <message>
+ <source>Clazy Issue</source>
+ <translation>Проблема Clazy</translation>
+ </message>
+ <message>
+ <source>Clang-Tidy Issue</source>
+ <translation>Проблема Clang-Tidy</translation>
+ </message>
+</context>
+<context>
<name>ClangHoverHandler</name>
<message>
<source>%1 bytes</source>
@@ -5513,16 +5613,18 @@ However, using the relaxed and extended rules means also that no highlighting/co
</message>
</context>
<context>
- <name>ClangStaticAnalyzer</name>
+ <name>ClangTools::ClangToolsBasicSettings</name>
<message>
- <source>The chosen file &quot;%1&quot; seems to point to an icecc binary not suitable for analyzing.
-Please set a real Clang executable.</source>
- <translation>Кажется, выбранный файл «%1» указывает на программу icecc непригодную для анализа.
-Укажите реальный исполняемый файл Clang.</translation>
+ <source>Form</source>
+ <translation></translation>
+ </message>
+ <message>
+ <source>Build the project before analysis</source>
+ <translation>Собирать проект перед анализом</translation>
</message>
</context>
<context>
- <name>ClangStaticAnalyzer::Diagnostic</name>
+ <name>ClangTools::Diagnostic</name>
<message>
<source>Category:</source>
<translation>Категория:</translation>
@@ -5532,6 +5634,10 @@ Please set a real Clang executable.</source>
<translation>Тип:</translation>
</message>
<message>
+ <source>Description:</source>
+ <translation>Описание:</translation>
+ </message>
+ <message>
<source>Context:</source>
<translation>Контекст:</translation>
</message>
@@ -5541,7 +5647,7 @@ Please set a real Clang executable.</source>
</message>
</context>
<context>
- <name>ClangStaticAnalyzer::ExplainingStep</name>
+ <name>ClangTools::ExplainingStep</name>
<message>
<source>Message:</source>
<translation>Сообщение:</translation>
@@ -5556,287 +5662,274 @@ Please set a real Clang executable.</source>
</message>
</context>
<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerConfigWidget</name>
+ <name>ClangTools::Internal::ClangTidyClazyRunner</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
- <source>General</source>
- <translation>Основное</translation>
+ <source>Clang-Tidy and Clazy</source>
+ <translation>Clang-Tidy и Clazy</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ClangTidyClazyTool</name>
<message>
- <source>Clang executable:</source>
- <translation>Исполняемый файл Clang:</translation>
+ <source>Clang-Tidy and Clazy Issues</source>
+ <translation>Проблемы Clang-Tidy и Clazy</translation>
</message>
<message>
- <source>Simultaneous processes:</source>
- <translation>Одновременных процессов:</translation>
+ <source>Go to previous diagnostic.</source>
+ <translation>Перейти к предыдущей диагностике.</translation>
</message>
<message>
- <source>Clang Command</source>
- <translation>Команда Clang</translation>
+ <source>Go to next diagnostic.</source>
+ <translation>Перейти к следующей диагностике.</translation>
</message>
<message>
- <source>Version: %1, supported.</source>
- <translation>Версия: %1, поддерживается.</translation>
+ <source>Apply Fixits</source>
+ <translation>Исправить</translation>
</message>
<message>
- <source>Version: %1, unsupported (supported version is %2).</source>
- <translation>Версия: %1, не поддерживается (поддерживается %2).</translation>
+ <source>Clang-Tidy and Clazy use a customized Clang executable from the Clang project to search for errors and warnings.</source>
+ <translation>Clang-Tidy и Clazy используют модифицированную программу Clang из проекта Clang для поиска ошибок и предупреждений.</translation>
</message>
<message>
- <source>Version: Could not determine version.</source>
- <translation>Версия: не удалось определить версию.</translation>
+ <source>Clang-Tidy and Clazy</source>
+ <translation>Clang-Tidy и Clazy</translation>
</message>
<message>
- <source>Version: Set valid executable first.</source>
- <translation>Версия: сначала задайте корректную программу.</translation>
+ <source>Clang-Tidy and Clazy...</source>
+ <translation>Clang-Tidy и Clazy...</translation>
</message>
<message>
- <source>TextLabel</source>
- <translation></translation>
+ <source>Clang-Tidy and Clazy tool stopped by user.</source>
+ <translation>Утилиты Clang-Tidy и Clazy остановлены пользователем.</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerDiagnosticModel</name>
<message>
- <source>Issue</source>
- <translation>Проблема</translation>
+ <source>Clang-Tidy and Clazy are still running.</source>
+ <translation>Clang-Tidy и Clazy ещё работают.</translation>
</message>
<message>
- <source>Location</source>
- <translation>Размещение</translation>
+ <source>Start Clang-Tidy and Clazy.</source>
+ <translation>Запуск Clang-Tidy и Clazy.</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerDiagnosticView</name>
<message>
- <source>Suppress This Diagnostic</source>
- <translation>Подавить эту диагностику</translation>
+ <source>This is not a C++ project.</source>
+ <translation>Это не проект на языке C++.</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerLogFileReader</name>
<message>
- <source>File is not a plist version 1.0 file.</source>
- <translation>Файл не является plist версии 1.0.</translation>
+ <source>Clang-Tidy and Clazy are running.</source>
+ <translation>Clang-Tidy и Clazy работают.</translation>
</message>
<message>
- <source>Expected a string element.</source>
- <translation>Ожидается строковый элемент.</translation>
+ <source>Clang-Tidy and Clazy finished.</source>
+ <translation>Clang-Tidy и Clazy завершились.</translation>
</message>
<message>
- <source>Expected an array element.</source>
- <translation>Ожидается элемент типа массив.</translation>
+ <source>No issues found.</source>
+ <translation>Проблем не найдено.</translation>
</message>
- <message>
- <source>Expected an integer element.</source>
- <translation>Ожидается целочисленный элемент.</translation>
+ <message numerus="yes">
+ <source>%n issues found.</source>
+ <translation>
+ <numerusform>Найдена %n проблема.</numerusform>
+ <numerusform>Найдено %n проблемы.</numerusform>
+ <numerusform>Найдено %n проблем.</numerusform>
+ </translation>
</message>
</context>
<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerOptionsPage</name>
+ <name>ClangTools::Internal::ClangToolRunControl</name>
<message>
- <source>Clang Static Analyzer</source>
- <translation>Статический анализатор Clang</translation>
+ <source>Release</source>
+ <translation>Выпуск</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerPlugin</name>
<message>
- <source>Clang Static Analyzer</source>
- <translation>Статический анализатор Clang</translation>
+ <source>Run %1 in %2 Mode?</source>
+ <translation>Выполнить %1 в режиме %2?</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerRunner</name>
<message>
- <source>An error occurred with the Clang Static Analyzer process.</source>
- <translation>Возникла ошибка при статическом анализе Clang.</translation>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You are trying to run the tool &quot;%1&quot; on an application in %2 mode. The tool is designed to be used in Debug mode since enabled assertions can reduce the number of false positives.&lt;/p&gt;&lt;p&gt;Do you want to continue and run the tool in %2 mode?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вы пытаетесь запустить «%1» для приложения в режиме %2. Этот инструмент разработан для использования в отладочном режиме, так как включённые утверждения могут уменьшить число ложных срабатываний.&lt;/p&gt;&lt;p&gt;Продолжить запуск в режиме %2?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
- <source>Clang Static Analyzer crashed.</source>
- <translation>Статический анализ Clang аварийно завершился.</translation>
+ <source>%1: Can&apos;t find clang executable, stop.</source>
+ <translation>%1: не удалось найти программу clang, остановлено.</translation>
</message>
<message>
- <source>Clang Static Analyzer finished with exit code: %1.</source>
- <translation>Статический анализ Clang завершился с кодом %1.</translation>
+ <source>The project configuration changed since the start of the %1. Please re-run with current configuration.</source>
+ <translation>Настройки проекта изменились с момента запуска %1. Перезапустите с текущей конфигурацией.</translation>
</message>
<message>
- <source>Command line: %1
-Process Error: %2
-Output:
-%3</source>
- <translation>Командная строка: %1
-Ошибка: %2
-Вывод:
-%3</translation>
+ <source>Running %1 on %2</source>
+ <translation>Запуск %1 на %2</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerTool</name>
<message>
- <source>Clang Static Analyzer Issues</source>
- <translatorcomment>Если перевести буквально, то будет очень длинно</translatorcomment>
- <translation>Статический анализатор Clang</translation>
+ <source>: Failed to create temporary dir, stop.</source>
+ <translation>: не удалось создать временный каталог, остановлено.</translation>
</message>
<message>
- <source>Go to previous bug.</source>
- <translation>К предыдущей проблеме.</translation>
+ <source>Analyzing</source>
+ <translation>Анализ</translation>
</message>
<message>
- <source>Go to next bug.</source>
- <translation>К следующей проблеме.</translation>
+ <source>Analyzing &quot;%1&quot;.</source>
+ <translation>Анализ «%1».</translation>
</message>
<message>
- <source>Clang Static Analyzer uses the analyzer from the Clang project to find bugs.</source>
- <translation>Статический анализатор Clang использует анализатор из проекта Clang для поиска ошибок.</translation>
+ <source>Failed to analyze &quot;%1&quot;: %2</source>
+ <translation>Не удалось проанализировать «%1»: %2</translation>
</message>
<message>
- <source>Clang Static Analyzer</source>
- <translation>Статический анализатор Clang</translation>
+ <source> finished: Processed %1 files successfully, %2 failed.</source>
+ <translation> завершено: успешно обработано %1 файл(ов) и %2 обработать не удалось.</translation>
</message>
<message>
- <source>Release</source>
- <translation>Выпуск</translation>
+ <source>: Not all files could be analyzed.</source>
+ <translation>: не все файлы возможно проанализировать.</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ClangToolRunner</name>
<message>
- <source>Run %1 in %2 Mode?</source>
- <translation>Выполнить %1 в режиме %2?</translation>
+ <source>An error occurred with the %1 process.</source>
+ <translation>У процесса %1 возникла ошибка.</translation>
</message>
<message>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You are trying to run the tool &quot;%1&quot; on an application in %2 mode. The tool is designed to be used in Debug mode since enabled assertions can reduce the number of false positives.&lt;/p&gt;&lt;p&gt;Do you want to continue and run the tool in %2 mode?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вы пытаетесь запустить «%1» для приложения в режиме %2. Этот инструмент разработан для использования в отладочном режиме, так как включённые утверждения могут уменьшить число ложных срабатываний.&lt;/p&gt;&lt;p&gt;Продолжить запуск в режиме %2?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ <source>%1 crashed.</source>
+ <translation>%1 аварийно завершился.</translation>
</message>
<message>
- <source>Clang Static Analyzer stopped by user.</source>
- <translation>Статический анализатор Clang остановлен пользователем.</translation>
+ <source>%1 finished with exit code: %2.</source>
+ <translation>%1 завершился с кодом %2.</translation>
</message>
<message>
- <source>Clang Static Analyzer is still running.</source>
- <translation>Статический анализатор Clang ещё работает.</translation>
+ <source>Command line: %1
+Process Error: %2
+Output:
+%3</source>
+ <translation>Командная строка: %1
+Ошибка: %2
+Вывод:
+%3</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ClangToolsConfigWidget</name>
<message>
- <source>Start Clang Static Analyzer.</source>
- <translation>Запустить статический анализатор Clang.</translation>
+ <source>General</source>
+ <translation>Основное</translation>
</message>
<message>
- <source>This is not a C++ project.</source>
- <translation>Это не проект на языке C++.</translation>
+ <source>Simultaneous processes:</source>
+ <translation>Одновременных процессов:</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ClangToolsDiagnosticModel</name>
<message>
- <source>Clang Static Analyzer is running.</source>
- <translation>Статический анализатор Clang работает.</translation>
+ <source>Issue</source>
+ <translation>Проблема</translation>
</message>
<message>
- <source>Clang Static Analyzer finished.</source>
- <translation>Статический анализ Clang завершён.</translation>
+ <source>Location</source>
+ <translation>Размещение</translation>
</message>
<message>
- <source>No issues found.</source>
- <translation>Проблем не найдено.</translation>
+ <source>Fixit Status</source>
+ <translation>Состояние исправления</translation>
</message>
- <message numerus="yes">
- <source>%n issues found (%1 suppressed).</source>
- <translation>
- <numerusform>найдена %n проблема (%1 подавлено).</numerusform>
- <numerusform>найдено %n проблемы (%1 подавлено).</numerusform>
- <numerusform>найдено %n проблем (%1 подавлено).</numerusform>
- </translation>
+ <message>
+ <source>No Fixits</source>
+ <translation>Нет исправлений</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ClangStaticAnalyzerToolRunner</name>
<message>
- <source>The project configuration changed since the start of the Clang Static Analyzer. Please re-run with current configuration.</source>
- <translation>Конфигурация проекта изменилась с момента запуска статического анализатора Clang. Перезапустите его.</translation>
+ <source>Not Scheduled</source>
+ <translation>Не запланировано</translation>
</message>
<message>
- <source>Running Clang Static Analyzer on %1</source>
- <translation>Выполнение статического анализа Clang для %1</translation>
+ <source>Invalidated</source>
+ <translation>Аннулировано</translation>
</message>
<message>
- <source>Clang Static Analyzer: Invalid executable &quot;%1&quot;, stop.</source>
- <translation>Статический анализатор Clang: Неверная программа «%1», остановлено.</translation>
+ <source>Scheduled</source>
+ <translation>Запланировано</translation>
</message>
<message>
- <source>Clang Static Analyzer: Running with possibly unsupported version, could not determine version from executable &quot;%1&quot;.</source>
- <translation>Статический анализатор Clang: возможно, работа с неподдерживаемой версией, так как её не удалось определить из программы «%1».</translation>
+ <source>Failed to Apply</source>
+ <translation>Не удалось применить</translation>
</message>
<message>
- <source>Clang Static Analyzer: Running with unsupported version %1, supported version is %2.</source>
- <translation>Статический анализатор Clang: работа с неподдерживаемой версией %1; поддерживается %2.</translation>
+ <source>Applied</source>
+ <translation>Применено</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ClangToolsOptionsPage</name>
<message>
- <source>Clang Static Analyzer: Failed to create temporary dir, stop.</source>
- <translation>Статический анализатор Clang: Не удалось создать временный каталог, остановлено.</translation>
+ <source>Clang Tools</source>
+ <translation>Инструменты Clang</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ClangToolsPlugin</name>
<message>
- <source>Analyzing</source>
- <translation>Анализ</translation>
+ <source>Clang Tools</source>
+ <translation>Инструменты Clang</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::DiagnosticView</name>
<message>
- <source>Analyzing &quot;%1&quot;.</source>
- <translation>Анализ «%1».</translation>
+ <source>Suppress This Diagnostic</source>
+ <translation>Подавить эту диагностику</translation>
</message>
+</context>
+<context>
+ <name>ClangTools::Internal::ProjectSettingsWidget</name>
<message>
- <source>Failed to analyze &quot;%1&quot;: %2</source>
- <translation>Не удалось проанализировать «%1»: %2</translation>
+ <source>Suppressed diagnostics:</source>
+ <translation>Подавляемые диагностики:</translation>
</message>
<message>
- <source>Clang Static Analyzer finished: Processed %1 files successfully, %2 failed.</source>
- <translation>Работа статического анализатора Clang завершена: Успешно обработано %1 файлов и %2 не удалось.</translation>
+ <source>Remove Selected</source>
+ <translation>Удалить выбранное</translation>
</message>
<message>
- <source>Clang Static Analyzer: Not all files could be analyzed.</source>
- <translation>Статический анализатор Clang: Не все файлы удалось проанализовать.</translation>
+ <source>Remove All</source>
+ <translation>Удалить всё</translation>
</message>
</context>
<context>
- <name>ClangStaticAnalyzer::Internal::LogFileReader</name>
- <message>
- <source>File &quot;%1&quot; does not exist or is not readable.</source>
- <translation>Файл «%1» не существует или не читается.</translation>
- </message>
- <message>
- <source>Could not read file &quot;%1&quot;: UnexpectedElementError.</source>
- <translation>Не удалось прочитать файл «%1»: UnexpectedElementError.</translation>
- </message>
+ <name>ClangTools::Internal::SelectableFilesDialog</name>
<message>
- <source>Could not read file &quot;%1&quot;: CustomError.</source>
- <translation>Не удалось прочитать файл «%1»: CustomError.</translation>
+ <source>Analyzer Configuration</source>
+ <translation>Конфигурация анализатора</translation>
</message>
<message>
- <source>Could not read file &quot;%1&quot;: NotWellFormedError.</source>
- <translation>Не удалось прочитать файл «%1»: NotWellFormedError.</translation>
+ <source>General</source>
+ <translation>Основное</translation>
</message>
<message>
- <source>Could not read file &quot;%1&quot;: PrematureEndOfDocumentError.</source>
- <translation>Не удалось прочитать файл «%1»: PrematureEndOfDocumentError.</translation>
+ <source>Global Settings</source>
+ <translation>Глобальные настройки</translation>
</message>
-</context>
-<context>
- <name>ClangStaticAnalyzer::Internal::ProjectSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
+ <source>Custom Settings</source>
+ <translation>Особые настройки</translation>
</message>
<message>
- <source>Remove Selected</source>
- <translation>Удалить выбранное</translation>
+ <source>Files to Analyze</source>
+ <translation>Анализируемые файлы</translation>
</message>
<message>
- <source>Remove All</source>
- <translation>Удалить всё</translation>
+ <source>Files outside of the base directory</source>
+ <translation>Файлы вне базового каталога</translation>
</message>
<message>
- <source>Suppressed diagnostics:</source>
- <translation>Подавляемые диагностики:</translation>
+ <source>Analyze</source>
+ <translation>Анализировать</translation>
</message>
</context>
<context>
- <name>ClangStaticAnalyzer::Internal::SuppressedDiagnosticsModel</name>
+ <name>ClangTools::Internal::SuppressedDiagnosticsModel</name>
<message>
<source>File</source>
<translation>Файл</translation>
@@ -6497,10 +6590,6 @@ Output:
<context>
<name>CodePaster::Internal::FileShareProtocolSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>The fileshare-based paster protocol allows for sharing code snippets using simple files on a shared network drive. Files are never deleted.</source>
<translation>Протокол на базе общих файлов позволяет публиковать фрагменты кода используя обычные файлы на общем сетевом диске. Файлы никогда не удаляются.</translation>
</message>
@@ -6520,10 +6609,6 @@ Output:
<context>
<name>CodePaster::Internal::PasteBinComSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; allows for sending posts to custom subdomains (eg. creator.pastebin.com). Fill in the desired prefix.</source>
<translation>&lt;a href=&quot;http://pastebin.com&quot;&gt;pastebin.com&lt;/a&gt; позволяет отправлять данные на пользовательские субдомены (например, creator.pastebin.com). Поэтому укажите желаемый префикс.</translation>
</message>
@@ -6645,6 +6730,14 @@ p, li { white-space: pre-wrap; }
<context>
<name>CodePaster::NetworkProtocol</name>
<message>
+ <source>Pasting needs authentication.&lt;br/&gt;Enter your identity credentials to continue.</source>
+ <translation>Вставка требует авторизации.&lt;br/&gt;Для продолжения введите ваши реквизиты.</translation>
+ </message>
+ <message>
+ <source>Authenticate for Paster</source>
+ <translation>Авторизация для Paster</translation>
+ </message>
+ <message>
<source>Checking connection</source>
<translation>Проверка соединения</translation>
</message>
@@ -6777,10 +6870,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>ContextPaneWidgetBorderImage</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>10 x 10</source>
<translation></translation>
</message>
@@ -6808,10 +6897,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>ContextPaneWidgetImage</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>10 x 10</source>
<translation></translation>
</message>
@@ -6843,10 +6928,6 @@ p, li { white-space: pre-wrap; }
<context>
<name>ContextPaneWidgetRectangle</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>Gradient</source>
<translation>Градиент</translation>
</message>
@@ -7206,8 +7287,19 @@ Continue?</source>
</message>
</context>
<context>
+ <name>Core::HelpManager</name>
+ <message>
+ <source>Update Documentation</source>
+ <translation>Обновить документацию</translation>
+ </message>
+</context>
+<context>
<name>Core::ICore</name>
<message>
+ <source>Settings...</source>
+ <translation>Настройки...</translation>
+ </message>
+ <message>
<source> (%1)</source>
<translation> (%1)</translation>
</message>
@@ -7570,6 +7662,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<context>
<name>Core::Internal::EditorManagerPrivate</name>
<message>
+ <source>Properties...</source>
+ <translation>Свойства...</translation>
+ </message>
+ <message>
<source>Revert File to Saved</source>
<translation>Вернуть файл к сохранённому состоянию</translation>
</message>
@@ -7917,10 +8013,6 @@ Do you want to kill it?</source>
<context>
<name>Core::Internal::ExternalToolConfig</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Add</source>
<translation>Добавить</translation>
</message>
@@ -8288,6 +8380,10 @@ Do you want to kill it?</source>
<translation>Требуется перезапуск</translation>
</message>
<message>
+ <source>The high DPI settings will take effect after restart.</source>
+ <translation>Настройка высокого DPI вступит в силу после перезапуска.</translation>
+ </message>
+ <message>
<source>The language change will take effect after restart.</source>
<translation>Изменение языка вступит в силу после перезапуска.</translation>
</message>
@@ -8329,6 +8425,15 @@ Do you want to kill it?</source>
<source>Theme:</source>
<translation>Тема:</translation>
</message>
+ <message>
+ <source>Enable high DPI scaling</source>
+ <translation>Масштабировать при большом DPI</translation>
+ </message>
+ <message>
+ <source>High DPI scaling:</source>
+ <translatorcomment>На форме полный перевод выглядит коряво</translatorcomment>
+ <translation>Высокий DPI:</translation>
+ </message>
</context>
<context>
<name>Core::Internal::JavaScriptFilter</name>
@@ -8619,6 +8724,26 @@ Do you want to kill it?</source>
<translation>Ctrl+Meta+W</translation>
</message>
<message>
+ <source>Cycle Mode Selector Styles</source>
+ <translation type="unfinished">Зациклить стили режима выбора</translation>
+ </message>
+ <message>
+ <source>Mode Selector Style</source>
+ <translation type="unfinished">Стиль режима выбора</translation>
+ </message>
+ <message>
+ <source>Icons and Text</source>
+ <translation>Значки и текст</translation>
+ </message>
+ <message>
+ <source>Icons Only</source>
+ <translation>Только значки</translation>
+ </message>
+ <message>
+ <source>Hidden</source>
+ <translation type="unfinished">Скрыто</translation>
+ </message>
+ <message>
<source>Ctrl+0</source>
<translation>Ctrl+0</translation>
</message>
@@ -8635,10 +8760,6 @@ Do you want to kill it?</source>
<translation>Alt+Shift+0</translation>
</message>
<message>
- <source>Show Mode Selector</source>
- <translation>Показать выбор режимов</translation>
- </message>
- <message>
<source>About &amp;%1</source>
<translation>О программе &amp;%1</translation>
</message>
@@ -8667,10 +8788,6 @@ Do you want to kill it?</source>
<source>About &amp;Plugins...</source>
<translation>О &amp;модулях...</translation>
</message>
- <message>
- <source>Settings...</source>
- <translation>Настройки...</translation>
- </message>
</context>
<context>
<name>Core::Internal::MenuBarFilter</name>
@@ -8802,10 +8919,6 @@ Do you want to kill it?</source>
<context>
<name>Core::Internal::MimeTypeSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Registered MIME Types</source>
<translation>Зарегистрированные типы MIME</translation>
</message>
@@ -10120,8 +10233,8 @@ to version control (%2)
<translation>&lt;b&gt;Внимание!&lt;/b&gt; Этот файл не является частью какого-либо проекта. Модель кода может не разобрать его корректно.</translation>
</message>
<message>
- <source>&lt;b&gt;Warning&lt;/b&gt;: The code model could not parse an included file, which might lead to slow or incorrect code completion and highlighting, for example.</source>
- <translation>&lt;b&gt;Внимание!&lt;/b&gt; Модель кода не сможет обрабатывать включённый файл, который может приводить к замедлению или неверному дополнению кода и подсветки, например.</translation>
+ <source>&lt;b&gt;Warning&lt;/b&gt;: The code model could not parse an included file, which might lead to incorrect code completion and highlighting, for example.</source>
+ <translation>&lt;b&gt;Внимание!&lt;/b&gt; Модель кода не сможет обрабатывать включённый файл, который, например, может приводить к неверному дополнению кода и подсветки.</translation>
</message>
</context>
<context>
@@ -10198,6 +10311,34 @@ to version control (%2)
<translation>Модель кода</translation>
</message>
<message>
+ <source>Diagnostic Configurations</source>
+ <translation>Конфигурации диагностики</translation>
+ </message>
+ <message>
+ <source>C++ Symbols in Current Document</source>
+ <translation>Символы C++ текущего документа</translation>
+ </message>
+ <message>
+ <source>C++ Classes</source>
+ <translation>Классы C++</translation>
+ </message>
+ <message>
+ <source>C++ Functions</source>
+ <translation>Функции C++</translation>
+ </message>
+ <message>
+ <source>All Included C/C++ Files</source>
+ <translation>Все подключённые файлы С/С++</translation>
+ </message>
+ <message>
+ <source>C++ Classes, Enums and Functions</source>
+ <translation>Классы, перечисления и функции C++</translation>
+ </message>
+ <message>
+ <source>C++ Symbols</source>
+ <translation>Символы C++</translation>
+ </message>
+ <message>
<source>C++</source>
<translation>C++</translation>
</message>
@@ -10216,21 +10357,28 @@ to version control (%2)
<context>
<name>CppTools::ClangBaseChecks</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>For appropriate options, consult the GCC or Clang manual pages or the &lt;a href=&quot;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html&quot;&gt;GCC online documentation&lt;/a&gt;.</source>
<translation>Описание параметров можно найти страницах man GCC или Clang или в &lt;a href=&quot;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html&quot;&gt;Документации GCC&lt;/a&gt;.</translation>
</message>
</context>
<context>
- <name>CppTools::ClangDiagnosticConfigsWidget</name>
+ <name>CppTools::ClangDiagnosticConfigsSelectionWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
+ <source>Diagnostic Configuration:</source>
+ <translation>Конфигурация диагностики:</translation>
+ </message>
+ <message>
+ <source>Manage...</source>
+ <translation>Управление...</translation>
</message>
<message>
+ <source>Diagnostic Configurations</source>
+ <translation>Конфигурации диагностики</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::ClangDiagnosticConfigsWidget</name>
+ <message>
<source>Copy...</source>
<translation>Копировать...</translation>
</message>
@@ -10259,6 +10407,14 @@ to version control (%2)
<translation>Изменить можно только копию этой конфигурации.</translation>
</message>
<message>
+ <source>Edit Checks as String...</source>
+ <translation>Изменить проверки...</translation>
+ </message>
+ <message>
+ <source>View Checks as String...</source>
+ <translation>Посмотреть проверки...</translation>
+ </message>
+ <message>
<source>Configuration passes sanity checks.</source>
<translation>Конфигурация прошла предпроверку.</translation>
</message>
@@ -10267,6 +10423,10 @@ to version control (%2)
<translation>%1</translation>
</message>
<message>
+ <source>Checks</source>
+ <translation>Проверки</translation>
+ </message>
+ <message>
<source>Clang</source>
<translation>Clang</translation>
</message>
@@ -10290,10 +10450,6 @@ to version control (%2)
<context>
<name>CppTools::ClazyChecks</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Each level adds checks to the previous level. For more information, see &lt;a href=&quot;https://github.com/KDE/clazy&quot;&gt;clazy&apos;s homepage&lt;/a&gt;.</source>
<translation>Каждый уровень добавляет проверки к предыдущему. Подробнее на &lt;a href=&quot;https://github.com/KDE/clazy&quot;&gt;домашней странице clazy&lt;/a&gt;.</translation>
</message>
@@ -10323,13 +10479,6 @@ to version control (%2)
</message>
</context>
<context>
- <name>CppTools::CppClassesFilter</name>
- <message>
- <source>C++ Classes</source>
- <translation>Классы C++</translation>
- </message>
-</context>
-<context>
<name>CppTools::CppEditorOutline</name>
<message>
<source>Sort Alphabetically</source>
@@ -10366,10 +10515,6 @@ to version control (%2)
<context>
<name>CppTools::Internal::CppCodeModelSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>&lt;i&gt;The Clang Code Model is enabled because the corresponding plugin is loaded.&lt;/i&gt;</source>
<translation>&lt;i&gt;Модель кода Clang включена, так как соответствующий модуль загружен.&lt;/i&gt;</translation>
</message>
@@ -10402,17 +10547,13 @@ to version control (%2)
<translation>Игнорировать прекомпилированные заголовки</translation>
</message>
<message>
- <source>Clang Diagnostics</source>
- <translation>Диагностика Clang</translation>
+ <source>Clang Code Model</source>
+ <translation>Модель кода Clang</translation>
</message>
</context>
<context>
<name>CppTools::Internal::CppCodeStyleSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>General</source>
<translation>Основное</translation>
</message>
@@ -10646,13 +10787,6 @@ if (a &amp;&amp;
</message>
</context>
<context>
- <name>CppTools::Internal::CppCurrentDocumentFilter</name>
- <message>
- <source>C++ Symbols in Current Document</source>
- <translation>Символы C++ текущего документа</translation>
- </message>
-</context>
-<context>
<name>CppTools::Internal::CppFileSettingsPage</name>
<message>
<source>Headers</source>
@@ -10792,27 +10926,6 @@ These prefixes are used in addition to current file name on Switch Header/Source
</message>
</context>
<context>
- <name>CppTools::Internal::CppFunctionsFilter</name>
- <message>
- <source>C++ Functions</source>
- <translation>Функции C++</translation>
- </message>
-</context>
-<context>
- <name>CppTools::Internal::CppIncludesFilter</name>
- <message>
- <source>All Included C/C++ Files</source>
- <translation>Все подключённые файлы С/С++</translation>
- </message>
-</context>
-<context>
- <name>CppTools::Internal::CppLocatorFilter</name>
- <message>
- <source>C++ Classes, Enums and Functions</source>
- <translation>Классы, перечисления и функции C++</translation>
- </message>
-</context>
-<context>
<name>CppTools::Internal::CppToolsPlugin</name>
<message>
<source>&amp;C++</source>
@@ -10846,10 +10959,6 @@ These prefixes are used in addition to current file name on Switch Header/Source
<context>
<name>CppTools::Internal::SymbolsFindFilter</name>
<message>
- <source>C++ Symbols</source>
- <translation>Символы C++</translation>
- </message>
- <message>
<source>Searching for Symbol</source>
<translation>Поиск символа</translation>
</message>
@@ -10926,6 +11035,17 @@ Flags: %3</source>
</message>
</context>
<context>
+ <name>CppTools::OverviewModel</name>
+ <message>
+ <source>&lt;Select Symbol&gt;</source>
+ <translation>&lt;Выберите символ&gt;</translation>
+ </message>
+ <message>
+ <source>&lt;No Symbols&gt;</source>
+ <translation>&lt;Нет символов&gt;</translation>
+ </message>
+</context>
+<context>
<name>CppTools::QuickFix</name>
<message>
<source>Rewrite Using %1</source>
@@ -11055,8 +11175,27 @@ Flags: %3</source>
<context>
<name>CppTools::TidyChecks</name>
<message>
- <source>Form</source>
- <translation></translation>
+ <source>Disable</source>
+ <translation>Отключено</translation>
+ </message>
+ <message>
+ <source>Select Checks</source>
+ <translation>Выбранные проверки</translation>
+ </message>
+ <message>
+ <source>Use .clang-tidy config file</source>
+ <translation>Использовать файл .clang-tidy</translation>
+ </message>
+ <message>
+ <source>Edit Checks as String...</source>
+ <translation>Изменить проверки...</translation>
+ </message>
+</context>
+<context>
+ <name>CppTools::TidyChecksTreeModel</name>
+ <message>
+ <source>Web Page</source>
+ <translation>Вэб-страница</translation>
</message>
</context>
<context>
@@ -12034,19 +12173,35 @@ Flags: %3</source>
</message>
<message>
<source>Disable Selected Breakpoints</source>
- <translation>Деактивировать выбранные точки останова</translation>
+ <translation>Выключить выбранные точки останова</translation>
</message>
<message>
<source>Enable Selected Breakpoints</source>
- <translation>Активировать выбранные точки останова</translation>
+ <translation>Включить выбранные точки останова</translation>
</message>
<message>
<source>Disable Breakpoint</source>
- <translation>Деактивировать точку останова</translation>
+ <translation>Выключить точку останова</translation>
</message>
<message>
<source>Enable Breakpoint</source>
- <translation>Активировать точку останова</translation>
+ <translation>Включить точку останова</translation>
+ </message>
+ <message>
+ <source>Disable Selected Locations</source>
+ <translation>Выключить выбранные места</translation>
+ </message>
+ <message>
+ <source>Enable Selected Locations</source>
+ <translation>Включить выбранные места</translation>
+ </message>
+ <message>
+ <source>Disable Location</source>
+ <translation>Выключить место</translation>
+ </message>
+ <message>
+ <source>Enable Location</source>
+ <translation>Включить место</translation>
</message>
<message>
<source>Delete All Breakpoints</source>
@@ -14496,11 +14651,11 @@ In this case, the value should be increased.</source>
<translation>Команда:</translation>
</message>
<message>
- <source>Note: This log contains possibly confidential information about your machine, environment variables, in-memory data of the processes you are debugging, and more. It is never transferred over the internet by %1, and only stored to disk if you manually use the respective option from the context menu, or through mechanisms that are not under the control of %1, for instance in swap files.
+ <source>Note: This log contains possibly confidential information about your machine, environment variables, in-memory data of the processes you are debugging, and more. It is never transferred over the internet by %1, and only stored to disk if you manually use the respective option from the context menu, or through mechanisms that are not under the control of %1&apos;s Debugger plugin, for instance in swap files, or other plugins you might use.
You may be asked to share the contents of this log when reporting bugs related to debugger operation. In this case, make sure your submission does not contain data you do not want to or you are not allowed to share.
</source>
- <translation>Замечание: Этот журнал может содержать конфиденциальную информацию о вашей машине, переменных среды, данных из памяти отлаживаемых процессов и пр. %1 никогда не передаёт его по сети Internet, а только сохраняет на диск, при использовании соответствующей опции контекстного меню или через неподконтрольный %1 механизм, например, файл подкачки.
+ <translation>Замечание: Этот журнал может содержать конфиденциальную информацию о вашей машине, переменных среды, данных из памяти отлаживаемых процессов и пр. %1 никогда не передаёт его по сети Internet, а только сохраняет на диск, при использовании соответствующей опции контекстного меню или через неподконтрольный механизм модуля отладчика %1, например, файл подкачки или другие используемые модули.
Вас могут попросить поделиться журналом при сообщении об ошибках при отладке. В этом случае убедитесь, что отправляемое содержимое не содержит данных, которые публиковать недопустимо.
</translation>
@@ -17364,6 +17519,73 @@ will also disable the following plugins:
</message>
</context>
<context>
+ <name>FilePropertiesDialog</name>
+ <message>
+ <source>File Properties</source>
+ <translation>Свойства файла</translation>
+ </message>
+ <message>
+ <source>Owner:</source>
+ <translation>Владелец:</translation>
+ </message>
+ <message>
+ <source>Group:</source>
+ <translation>Группа:</translation>
+ </message>
+ <message>
+ <source>Size:</source>
+ <translation>Размер:</translation>
+ </message>
+ <message>
+ <source>Name:</source>
+ <translation>Имя:</translation>
+ </message>
+ <message>
+ <source>Path:</source>
+ <translation>Путь:</translation>
+ </message>
+ <message>
+ <source>Last read:</source>
+ <translation>Прочитан:</translation>
+ </message>
+ <message>
+ <source>Last modified:</source>
+ <translation>Изменён:</translation>
+ </message>
+ <message>
+ <source>Readable:</source>
+ <translation>Можно читать:</translation>
+ </message>
+ <message>
+ <source>Writable:</source>
+ <translation>Можно писать:</translation>
+ </message>
+ <message>
+ <source>Executable:</source>
+ <translation>Можно запускать:</translation>
+ </message>
+ <message>
+ <source>Symbolic link:</source>
+ <translation>Символьная ссылка:</translation>
+ </message>
+ <message>
+ <source>MIME type:</source>
+ <translation>Тип MIME:</translation>
+ </message>
+ <message>
+ <source>Default editor:</source>
+ <translation>Редактор по-умолчанию:</translation>
+ </message>
+ <message>
+ <source>Undefined</source>
+ <translation>Неопределён</translation>
+ </message>
+ <message>
+ <source>%1 Bytes</source>
+ <translation>%1 байт</translation>
+ </message>
+</context>
+<context>
<name>FileResourcesModel</name>
<message>
<source>Open File</source>
@@ -17382,6 +17604,25 @@ will also disable the following plugins:
</message>
</context>
<context>
+ <name>FlameGraphView</name>
+ <message>
+ <source>others</source>
+ <translation>другие</translation>
+ </message>
+ <message>
+ <source>unknown</source>
+ <translation>неизвестно</translation>
+ </message>
+ <message>
+ <source>No data available</source>
+ <translation>Нет данных</translation>
+ </message>
+ <message>
+ <source>Visualize %1</source>
+ <translation>Отобразить %1</translation>
+ </message>
+</context>
+<context>
<name>FlickableSection</name>
<message>
<source>Flickable</source>
@@ -17535,13 +17776,6 @@ when they are not required, which will improve performance in most cases.</sourc
</message>
</context>
<context>
- <name>Form</name>
- <message>
- <source>Form</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>FormEditorW</name>
<message>
<source>Widget box</source>
@@ -17665,10 +17899,28 @@ when they are not required, which will improve performance in most cases.</sourc
<source>Google Test</source>
<translation>Google Test</translation>
</message>
+ <message>
+ <source>Enable or disable grouping of test cases by folder or gtest filter.
+See also Google Test settings.</source>
+ <translation>Включение или выключение группировки тестов по каталогу или фильтру GTest.
+Смотрите также настройки Google Test.</translation>
+ </message>
</context>
<context>
<name>GTestTreeItem</name>
<message>
+ <source>&lt;matching&gt;</source>
+ <translation>&lt;совпадает&gt;</translation>
+ </message>
+ <message>
+ <source>&lt;not matching&gt;</source>
+ <translation>&lt;не совпадает&gt;</translation>
+ </message>
+ <message>
+ <source>Change GTest filter in use inside the settings.</source>
+ <translation>Изменить используемый в настройках фильтр GTest.</translation>
+ </message>
+ <message>
<source>parameterized</source>
<translation>параметрический</translation>
</message>
@@ -17778,7 +18030,7 @@ when they are not required, which will improve performance in most cases.</sourc
</message>
</context>
<context>
- <name>GenericProjectManager::Internal::GenericProjectPlugin</name>
+ <name>GenericProjectManager::Internal::GenericProjectPluginPrivate</name>
<message>
<source>Edit Files...</source>
<translation>Изменить файлы...</translation>
@@ -18119,6 +18371,10 @@ were not verified among remotes in %3. Select different folder?</source>
<translation>Число фиксаций между %1 и %2: %3</translation>
</message>
<message>
+ <source>Are you sure you selected the right target branch?</source>
+ <translation>Уверены, что выбрали правильную целевую ветку?</translation>
+ </message>
+ <message>
<source>Checked - Mark change as WIP.
Unchecked - Mark change as ready for review.
Partially checked - Do not change current state.</source>
@@ -18335,46 +18591,6 @@ Would you like to terminate it?</source>
</translation>
</message>
<message>
- <source>Checkout</source>
- <translation>Смена ветки</translation>
- </message>
- <message>
- <source>Checkout branch?</source>
- <translation>Сменить ветку?</translation>
- </message>
- <message>
- <source>Would you like to delete the tag &quot;%1&quot;?</source>
- <translation>Удалить метку «%1»?</translation>
- </message>
- <message>
- <source>Would you like to delete the branch &quot;%1&quot;?</source>
- <translation>Удалить ветку «%1»?</translation>
- </message>
- <message>
- <source>Would you like to delete the &lt;b&gt;unmerged&lt;/b&gt; branch &quot;%1&quot;?</source>
- <translation>Удалить &lt;b&gt;неуправляемую&lt;/b&gt; ветку «%1»?</translation>
- </message>
- <message>
- <source>Delete Branch</source>
- <translation>Удалить ветку</translation>
- </message>
- <message>
- <source>Delete Tag</source>
- <translation>Удалить метку</translation>
- </message>
- <message>
- <source>Rename Tag</source>
- <translation>Переименовать метку</translation>
- </message>
- <message>
- <source>Git Reset</source>
- <translation>Git: Сброс изменений</translation>
- </message>
- <message>
- <source>Hard reset branch &quot;%1&quot; to &quot;%2&quot;?</source>
- <translation>Сбросить полностью ветку «%1» до состояния «%2»?</translation>
- </message>
- <message>
<source>Fast-Forward</source>
<translation>Быстрая промотка</translation>
</message>
@@ -18467,6 +18683,49 @@ Would you like to terminate it?</source>
</message>
</context>
<context>
+ <name>Git::Internal::BranchUtils</name>
+ <message>
+ <source>Checkout</source>
+ <translation>Смена ветки</translation>
+ </message>
+ <message>
+ <source>Checkout branch?</source>
+ <translation>Сменить ветку?</translation>
+ </message>
+ <message>
+ <source>Would you like to delete the tag &quot;%1&quot;?</source>
+ <translation>Удалить метку «%1»?</translation>
+ </message>
+ <message>
+ <source>Would you like to delete the branch &quot;%1&quot;?</source>
+ <translation>Удалить ветку «%1»?</translation>
+ </message>
+ <message>
+ <source>Would you like to delete the &lt;b&gt;unmerged&lt;/b&gt; branch &quot;%1&quot;?</source>
+ <translation>Удалить &lt;b&gt;неуправляемую&lt;/b&gt; ветку «%1»?</translation>
+ </message>
+ <message>
+ <source>Delete Tag</source>
+ <translation>Удалить метку</translation>
+ </message>
+ <message>
+ <source>Delete Branch</source>
+ <translation>Удалить ветку</translation>
+ </message>
+ <message>
+ <source>Rename Tag</source>
+ <translation>Переименовать метку</translation>
+ </message>
+ <message>
+ <source>Git Reset</source>
+ <translation>Git: Сброс изменений</translation>
+ </message>
+ <message>
+ <source>Hard reset branch &quot;%1&quot; to &quot;%2&quot;?</source>
+ <translation>Сбросить полностью ветку «%1» до состояния «%2»?</translation>
+ </message>
+</context>
+<context>
<name>Git::Internal::ChangeSelectionDialog</name>
<message>
<source>Browse &amp;History...</source>
@@ -18743,10 +19002,6 @@ Commit now?</source>
</translation>
</message>
<message>
- <source>&lt;None&gt;</source>
- <translation>&lt;Нет&gt;</translation>
- </message>
- <message>
<source>No changes found.</source>
<translation>Изменений не найдено.</translation>
</message>
@@ -19005,6 +19260,13 @@ Commit now?</source>
</message>
</context>
<context>
+ <name>Git::Internal::GitDiffEditorController</name>
+ <message>
+ <source>&lt;None&gt;</source>
+ <translation>&lt;Нет&gt;</translation>
+ </message>
+</context>
+<context>
<name>Git::Internal::GitEditorWidget</name>
<message>
<source>&amp;Blame %1</source>
@@ -20400,10 +20662,6 @@ Add, modify, and remove document filters, which determine the documentation set
<translation>Сохранить файл</translation>
</message>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>Font</source>
<translation>Шрифт</translation>
</message>
@@ -20845,6 +21103,184 @@ Add, modify, and remove document filters, which determine the documentation set
</message>
</context>
<context>
+ <name>HeobData</name>
+ <message>
+ <source>Process %1</source>
+ <translation>Процесс %1</translation>
+ </message>
+ <message>
+ <source>Process finished with exit code %1 (0x%2).</source>
+ <translation>Процесс завершился с кодом %1 (0x%2).</translation>
+ </message>
+ <message>
+ <source>Unknown argument: -%1</source>
+ <translation>Неизвестный параметр: -%1</translation>
+ </message>
+ <message>
+ <source>Cannot create target process.</source>
+ <translation>Не удалось создать целевой процесс.</translation>
+ </message>
+ <message>
+ <source>Wrong bitness.</source>
+ <translation>Неверная разрядность.</translation>
+ </message>
+ <message>
+ <source>Process killed.</source>
+ <translation>Процесс уничтожен.</translation>
+ </message>
+ <message>
+ <source>Only works with dynamically linked CRT.</source>
+ <translation>Работает только с динамически подключаемой CRT.</translation>
+ </message>
+ <message>
+ <source>Process stopped with unhandled exception code 0x%1.</source>
+ <translation>Процесс остановлен из-за необработанного исключения с кодом 0x%1.</translation>
+ </message>
+ <message>
+ <source>Not enough memory to keep track of allocations.</source>
+ <translation>Недостаточно памяти для сохранения истории выделений.</translation>
+ </message>
+ <message>
+ <source>Application stopped unexpectedly.</source>
+ <translation>Приложение неожиданно остановилось.</translation>
+ </message>
+ <message>
+ <source>Extra console.</source>
+ <translation>Допольнительная консоль.</translation>
+ </message>
+ <message>
+ <source>Unknown exit reason.</source>
+ <translation>Неизвестная причина завершения.</translation>
+ </message>
+ <message>
+ <source>Heob stopped unexpectedly.</source>
+ <translation>Heob неожиданно остановился.</translation>
+ </message>
+ <message>
+ <source>Heob: %1</source>
+ <translation>Heob: %1</translation>
+ </message>
+ <message>
+ <source>Heob: Failure in process attach handshake (%1).</source>
+ <translation>Heob: не удалось выполнить рукопожание при подключении к процессу (%1).</translation>
+ </message>
+</context>
+<context>
+ <name>HeobDialog</name>
+ <message>
+ <source>XML output file:</source>
+ <translation>Выходной файл XML:</translation>
+ </message>
+ <message>
+ <source>Handle exceptions:</source>
+ <translation>Обрабатывать исключения:</translation>
+ </message>
+ <message>
+ <source>Off</source>
+ <translation>Откл.</translation>
+ </message>
+ <message>
+ <source>On</source>
+ <translation>Вкл.</translation>
+ </message>
+ <message>
+ <source>Only</source>
+ <translation>Только</translation>
+ </message>
+ <message>
+ <source>Page protection:</source>
+ <translation>Защита страниц:</translation>
+ </message>
+ <message>
+ <source>After</source>
+ <translation>Перед</translation>
+ </message>
+ <message>
+ <source>Before</source>
+ <translation>После</translation>
+ </message>
+ <message>
+ <source>Freed memory protection</source>
+ <translation>Защита освобождённой памяти</translation>
+ </message>
+ <message>
+ <source>Raise breakpoint exception on error</source>
+ <translation>Кидать исключение (точка останова) при ошибке</translation>
+ </message>
+ <message>
+ <source>Leak details:</source>
+ <translation>Подробности об утечке:</translation>
+ </message>
+ <message>
+ <source>None</source>
+ <translation>Нет</translation>
+ </message>
+ <message>
+ <source>Simple</source>
+ <translation>Простые</translation>
+ </message>
+ <message>
+ <source>Detect Leak Types</source>
+ <translation>Определять типы утечек</translation>
+ </message>
+ <message>
+ <source>Detect Leak Types (Show Reachable)</source>
+ <translation>Определять типы утечек (показывать доступные)</translation>
+ </message>
+ <message>
+ <source>Fuzzy Detect Leak Types</source>
+ <translation>Нечётко определять типы утечек</translation>
+ </message>
+ <message>
+ <source>Fuzzy Detect Leak Types (Show Reachable)</source>
+ <translation>Нечётко определять типы утечек (показывать доступные)</translation>
+ </message>
+ <message>
+ <source>Minimum leak size:</source>
+ <translation>Минимальный размер утечки:</translation>
+ </message>
+ <message>
+ <source>Control leak recording:</source>
+ <translation>Управление записью утечек:</translation>
+ </message>
+ <message>
+ <source>On (Start Disabled)</source>
+ <translation>Вкл. (отключён старт)</translation>
+ </message>
+ <message>
+ <source>On (Start Enabled)</source>
+ <translation>Вкл. (включён старт)</translation>
+ </message>
+ <message>
+ <source>Run with debugger</source>
+ <translation>Запускать с отладчиком</translation>
+ </message>
+ <message>
+ <source>Extra arguments:</source>
+ <translation>Доп. параметры:</translation>
+ </message>
+ <message>
+ <source>Heob path:</source>
+ <translation>Путь к Heob:</translation>
+ </message>
+ <message>
+ <source>The location of heob32.exe and heob64.exe.</source>
+ <translation>Размещение heob32.exe и heob64.exe.</translation>
+ </message>
+ <message>
+ <source>Save current settings as default.</source>
+ <translation>Сохранить текущие настройки как настройки по умолчанию.</translation>
+ </message>
+ <message>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <source>Heob</source>
+ <translation>Heob</translation>
+ </message>
+</context>
+<context>
<name>ImageSpecifics</name>
<message>
<source>Image</source>
@@ -20923,6 +21359,10 @@ Would you like to overwrite it?</source>
<translation>Экспорт изображения</translation>
</message>
<message>
+ <source>Export a Series of Images from %1 (%2x%3</source>
+ <translation>Экспорт наборов изображений из %1 (%2x%3)</translation>
+ </message>
+ <message>
<source>Could not write file &quot;%1&quot;.</source>
<translation>Не удалось записать файл «%1».</translation>
</message>
@@ -20987,6 +21427,10 @@ Would you like to overwrite it?</source>
<source>Export Image</source>
<translation>Экспортировать изображение</translation>
</message>
+ <message>
+ <source>Export Multiple Images</source>
+ <translation>Экспортировать несколько изображений</translation>
+ </message>
</context>
<context>
<name>ImageViewer::Internal::ImageViewerToolbar</name>
@@ -21018,6 +21462,65 @@ Would you like to overwrite it?</source>
<source>Export as Image</source>
<translation>Экспортировать как изображение</translation>
</message>
+ <message>
+ <source>Export Images of Multiple Sizes</source>
+ <translation>Экспортировать многоразмерные изображения</translation>
+ </message>
+</context>
+<context>
+ <name>ImageViewer::Internal::MultiExportDialog</name>
+ <message>
+ <source>Enter a file name containing place holders %1 which will be replaced by the width and height of the image, respectively.</source>
+ <translation>Введите имя файла, содержащее метки %1, которые будут заменены соответственно на ширину и высоту изображения.</translation>
+ </message>
+ <message>
+ <source>File:</source>
+ <translation>Файл:</translation>
+ </message>
+ <message>
+ <source>Clear</source>
+ <translation>Очистить</translation>
+ </message>
+ <message>
+ <source>Set Standard Icon Sizes</source>
+ <translation>Задать стандартные размеры значков</translation>
+ </message>
+ <message>
+ <source>Generate Sizes</source>
+ <translation>Создать размеры</translation>
+ </message>
+ <message>
+ <source>A comma-separated list of size specifications of the form &quot;&lt;width&gt;x&lt;height&gt;&quot;.</source>
+ <translation>Список размеров разделённых запятыми в форме «&lt;ширина&gt;x&lt;высота&gt;».</translation>
+ </message>
+ <message>
+ <source>Sizes:</source>
+ <translation>Размеры:</translation>
+ </message>
+ <message>
+ <source>Please specify some sizes.</source>
+ <translation>Укажите какие-нибудь размеры.</translation>
+ </message>
+ <message>
+ <source>Invalid size specification: %1</source>
+ <translation>Неверный размер: %1</translation>
+ </message>
+ <message>
+ <source>The file name must contain one of the placeholders %1, %2.</source>
+ <translation>Имя файла должно содержать одну из меток %1, %2.</translation>
+ </message>
+ <message>
+ <source>The file %1 already exists.
+Would you like to overwrite it?</source>
+ <translation>Файл %1 уже существует.
+Перезаписать его?</translation>
+ </message>
+ <message>
+ <source>The files %1 already exist.
+Would you like to overwrite them?</source>
+ <translation>Файлы %1 уже существуют.
+Перезаписать их?</translation>
+ </message>
</context>
<context>
<name>ImportManagerComboBox</name>
@@ -21075,10 +21578,6 @@ Ids must begin with a lowercase letter.</source>
<context>
<name>Ios::Internal::IosBuildSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
@@ -21197,7 +21696,7 @@ Ids must begin with a lowercase letter.</source>
</message>
</context>
<context>
- <name>Ios::Internal::IosDeployConfigurationFactory</name>
+ <name>Ios::Internal::IosDeployConfiguration</name>
<message>
<source>Deploy on iOS</source>
<translation>Установка на iOS</translation>
@@ -21242,13 +21741,6 @@ Ids must begin with a lowercase letter.</source>
</message>
</context>
<context>
- <name>Ios::Internal::IosDeployStepWidget</name>
- <message>
- <source>Form</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>Ios::Internal::IosDevice</name>
<message>
<source>iOS Device</source>
@@ -21383,10 +21875,6 @@ Ids must begin with a lowercase letter.</source>
<source>Executable:</source>
<translation>Программа:</translation>
</message>
- <message>
- <source>iOS run settings</source>
- <translation>Настройки запуска iOS</translation>
- </message>
</context>
<context>
<name>Ios::Internal::IosRunSupport</name>
@@ -21955,6 +22443,13 @@ Error: %5</translation>
</message>
</context>
<context>
+ <name>LogFileReader</name>
+ <message>
+ <source>File &quot;%1&quot; does not exist or is not readable.</source>
+ <translation>Файл «%1» не существует или не читается.</translation>
+ </message>
+</context>
+<context>
<name>Macros</name>
<message>
<source>Macros</source>
@@ -21990,10 +22485,6 @@ Error: %5</translation>
<context>
<name>Macros::Internal::MacroOptionsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Preferences</source>
<translation>Настройки</translation>
</message>
@@ -22672,10 +23163,6 @@ Error: %5</translation>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>Configuration</source>
<translation>Настройка</translation>
</message>
@@ -23123,11 +23610,14 @@ Error: %5</translation>
</message>
</context>
<context>
- <name>Nim::NimCompilerBuildStepConfigWidget</name>
+ <name>Nim::NimCodeStyleSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
+ <source>Nim</source>
+ <translation>Nim</translation>
</message>
+</context>
+<context>
+ <name>Nim::NimCompilerBuildStepConfigWidget</name>
<message>
<source>Target:</source>
<translation>Цель:</translation>
@@ -23190,10 +23680,6 @@ Error: %5</translation>
<context>
<name>Nim::NimCompilerCleanStepConfigWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Working directory:</source>
<translation>Рабочий каталог:</translation>
</message>
@@ -23222,6 +23708,13 @@ Error: %5</translation>
</message>
</context>
<context>
+ <name>Nim::NimRunConfiguration</name>
+ <message>
+ <source>Current Build Target</source>
+ <translation>Цель текущей сборки</translation>
+ </message>
+</context>
+<context>
<name>Nim::NimSettings</name>
<message>
<source>Global</source>
@@ -23305,13 +23798,6 @@ Error: %5</translation>
</message>
</context>
<context>
- <name>NimRunConfiguration</name>
- <message>
- <source>Current Build Target</source>
- <translation>Цель текущей сборки</translation>
- </message>
-</context>
-<context>
<name>OpenWith::Editors</name>
<message>
<source>Plain Text Editor</source>
@@ -24304,6 +24790,10 @@ Error: %5</translation>
<source>The currently active run configuration&apos;s name.</source>
<translation>Имя текущей активной конфигурации запуска.</translation>
</message>
+ <message>
+ <source>Kits</source>
+ <translation>Комплекты</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::AbiWidget</name>
@@ -24587,22 +25077,14 @@ Error: %5</translation>
<source>Could not find the executable, please specify one.</source>
<translation>Не удалось найти программу, пожалуйста, укажите путь к ней.</translation>
</message>
+ <message>
+ <source>Executable:</source>
+ <translation>Программа:</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::CustomExecutableRunConfiguration</name>
<message>
- <source>No executable.</source>
- <translation>Программа не задана.</translation>
- </message>
- <message>
- <source>The executable
-%1
-cannot be found in the path.</source>
- <translation>Не удалось найти программу
-%1
-в стандартных путях.</translation>
- </message>
- <message>
<source>Custom Executable</source>
<translation>Особая программа</translation>
</message>
@@ -24612,13 +25094,6 @@ cannot be found in the path.</source>
</message>
</context>
<context>
- <name>ProjectExplorer::CustomExecutableRunConfigurationFactory</name>
- <message>
- <source>Custom Executable</source>
- <translation>Особая программа</translation>
- </message>
-</context>
-<context>
<name>ProjectExplorer::CustomWizard</name>
<message>
<source>URI:</source>
@@ -24779,17 +25254,14 @@ cannot be found in the path.</source>
<translation>Локальная установка</translation>
</message>
<message>
- <source>Deploy Settings</source>
- <translation>Настройки установки</translation>
- </message>
-</context>
-<context>
- <name>ProjectExplorer::DeployConfigurationFactory</name>
- <message>
<source>Deploy Configuration</source>
<extracomment>Display name of the default deploy configuration</extracomment>
<translation>Конфигурация установки</translation>
</message>
+ <message>
+ <source>Deploy Settings</source>
+ <translation>Настройки установки</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::DeploymentDataModel</name>
@@ -24805,10 +25277,6 @@ cannot be found in the path.</source>
<context>
<name>ProjectExplorer::DeploymentDataView</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Files to deploy:</source>
<translation>Установка файлов:</translation>
</message>
@@ -24827,10 +25295,6 @@ cannot be found in the path.</source>
<context>
<name>ProjectExplorer::DesktopDeviceConfigurationWidget</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>Machine type:</source>
<translation>Тип машины:</translation>
</message>
@@ -25114,6 +25578,29 @@ cannot be found in the path.</source>
</message>
</context>
<context>
+ <name>ProjectExplorer::ExecutableAspect</name>
+ <message>
+ <source>Executable</source>
+ <translation>Программа</translation>
+ </message>
+ <message>
+ <source>&lt;unknown&gt;</source>
+ <translation>&lt;неизвестно&gt;</translation>
+ </message>
+ <message>
+ <source>Executable:</source>
+ <translation>Программа:</translation>
+ </message>
+ <message>
+ <source>Alternate executable on device:</source>
+ <translation>Сменить программу на устройстве:</translation>
+ </message>
+ <message>
+ <source>Use this command instead</source>
+ <translation>Использовать эту команду</translation>
+ </message>
+</context>
+<context>
<name>ProjectExplorer::GccToolChain</name>
<message>
<source>%1 (%2, %3 %4 in %5)</source>
@@ -25357,10 +25844,6 @@ Excluding: %2
<context>
<name>ProjectExplorer::Internal::CodeStyleSettingsPropertiesPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Language:</source>
<translation>Язык:</translation>
</message>
@@ -25416,17 +25899,6 @@ Excluding: %2
</message>
</context>
<context>
- <name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name>
- <message>
- <source>Executable:</source>
- <translation>Программа:</translation>
- </message>
- <message>
- <source>Working directory:</source>
- <translation>Рабочий каталог:</translation>
- </message>
-</context>
-<context>
<name>ProjectExplorer::Internal::CustomParserConfigDialog</name>
<message>
<source>Custom Parser</source>
@@ -25528,6 +26000,10 @@ Excluding: %2
<translation>Настроть обработчик...</translation>
</message>
<message>
+ <source>MACRO[=VALUE]</source>
+ <translation>MACRO[=VALUE]</translation>
+ </message>
+ <message>
<source>Each line defines a macro. Format is MACRO[=VALUE].</source>
<translation>Каждая строка определяет макрос. Формат: MACRO[=VALUE].</translation>
</message>
@@ -25776,6 +26252,13 @@ Excluding: %2
</message>
</context>
<context>
+ <name>ProjectExplorer::Internal::FlatModel</name>
+ <message>
+ <source>No kits are enabled for this project. Enable kits in the &quot;Projects&quot; mode.</source>
+ <translation>Для этого проекта не включены комплекты. Включите их в режиме «Проект».</translation>
+ </message>
+</context>
+<context>
<name>ProjectExplorer::Internal::FolderNavigationWidget</name>
<message>
<source>Open &quot;%1&quot;</source>
@@ -25794,14 +26277,26 @@ Excluding: %2
<translation>Показать навигационную цепочку</translation>
</message>
<message>
+ <source>Show Folders on Top</source>
+ <translation>Показывать каталоги сверху</translation>
+ </message>
+ <message>
<source>Synchronize with Editor</source>
<translation>Согласовывать с редактором</translation>
</message>
<message>
+ <source>Synchronize Root Directory with Editor</source>
+ <translation>Синхронизировать корневой каталог с редактором</translation>
+ </message>
+ <message>
<source>The following projects failed to automatically remove the file: %1</source>
<translation>Не удалось автоматически удалить файл из следующих проектов: %1</translation>
</message>
<message>
+ <source>New Folder</source>
+ <translation>Новая папка</translation>
+ </message>
+ <message>
<source>Open Project in &quot;%1&quot;</source>
<translation>Открыть проект в «%1»</translation>
</message>
@@ -25840,6 +26335,18 @@ Excluding: %2
<source>Options</source>
<translation>Параметры</translation>
</message>
+ <message>
+ <source>Add New...</source>
+ <translation>Добавить новый...</translation>
+ </message>
+ <message>
+ <source>Rename...</source>
+ <translation>Переименовать...</translation>
+ </message>
+ <message>
+ <source>Remove...</source>
+ <translation>Удалить...</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::GccToolChainConfigWidget</name>
@@ -25918,6 +26425,14 @@ Excluding: %2
<source>No changes to apply.</source>
<translation>Без изменений.</translation>
</message>
+ <message>
+ <source>Force UTF-8 MSVC compiler output</source>
+ <translation>Заставить компилятор MSVC выводить сообщения в UTF-8</translation>
+ </message>
+ <message>
+ <source>Either switches MSVC to English or keeps the language and just forces UTF-8 output (may vary depending on the used MSVC compiler).</source>
+ <translation>Или переключает MSVC на английский или, сохраняя язык, переключает вывод в режим UTF-8 (зависит от используемого компилятора).</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::KitManagerConfigWidget</name>
@@ -26194,7 +26709,7 @@ Excluding: %2
</message>
<message>
<source>Merge stderr and stdout</source>
- <translation>Объединить stderr и stdout</translation>
+ <translation>Объединять stderr и stdout</translation>
</message>
<message>
<source>Reset</source>
@@ -26252,6 +26767,10 @@ Excluding: %2
<source>Limit build output to</source>
<translation>Ограничить вывод сборки</translation>
</message>
+ <message>
+ <source>Add linker library search paths to run environment</source>
+ <translation>Добавлять каталог библиотек компоновщика в среду исполнения</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::ProjectFileWizardExtension</name>
@@ -26294,6 +26813,14 @@ to project &quot;%2&quot;.</source>
<translation>Скрыть сгенерированные файлы</translation>
</message>
<message>
+ <source>Focus Document in Project Tree</source>
+ <translation>Перейти к документу в дереве проекта</translation>
+ </message>
+ <message>
+ <source>Alt+Shift+L</source>
+ <translation>Alt+Shift+L</translation>
+ </message>
+ <message>
<source>Hide Empty Directories</source>
<translation>Скрывать пустые каталоги</translation>
</message>
@@ -27735,6 +28262,10 @@ Use this only if you are prototyping. You cannot create a full application with
<translation>Тест Qt Quick</translation>
</message>
<message>
+ <source>Qt 5.11</source>
+ <translation>Qt 5.11</translation>
+ </message>
+ <message>
<source>Qt 5.10</source>
<translation>Qt 5.10</translation>
</message>
@@ -28223,6 +28754,13 @@ Use this only if you are prototyping. You cannot create a full application with
</message>
</context>
<context>
+ <name>ProjectExplorer::KitChooser</name>
+ <message>
+ <source>Kit of Active Project: %1</source>
+ <translation>Комплект активного проекта: %1</translation>
+ </message>
+</context>
+<context>
<name>ProjectExplorer::KitConfigWidget</name>
<message>
<source>Manage...</source>
@@ -28309,6 +28847,10 @@ Please close all running instances of your application before starting a build.<
<translation>Имя проекта</translation>
</message>
<message>
+ <source>Kit is not valid.</source>
+ <translation>Комплект неверен.</translation>
+ </message>
+ <message>
<source>Incompatible Kit</source>
<translation>Комплект не подходит</translation>
</message>
@@ -28504,18 +29046,10 @@ Please close all running instances of your application before starting a build.<
<translation>Alt+Backspace</translation>
</message>
<message>
- <source>Add New...</source>
- <translation>Добавить новый...</translation>
- </message>
- <message>
<source>Add Existing Files...</source>
<translation>Добавить существующие файлы...</translation>
</message>
<message>
- <source>Remove File...</source>
- <translation>Удалить файл...</translation>
- </message>
- <message>
<source>Duplicate File...</source>
<translation>Дублировать файл...</translation>
</message>
@@ -28525,10 +29059,6 @@ Please close all running instances of your application before starting a build.<
<translation>Убрать проект...</translation>
</message>
<message>
- <source>Rename...</source>
- <translation>Переименовать...</translation>
- </message>
- <message>
<source>Set as Active Project</source>
<translation>Сделать активным проектом</translation>
</message>
@@ -28777,6 +29307,10 @@ Do you want to ignore them?</source>
<translation>Добавить существующий каталог...</translation>
</message>
<message>
+ <source>Properties...</source>
+ <translation>Свойства...</translation>
+ </message>
+ <message>
<source>Set &quot;%1&quot; as Active Project</source>
<translation>Сделать «%1» активным проектом</translation>
</message>
@@ -28974,6 +29508,16 @@ Do you want to ignore them?</source>
<source>Unknown error.</source>
<translation>Неизвестная ошибка.</translation>
</message>
+ <message>
+ <source>Run on %1</source>
+ <extracomment>Shown in Run configuration if no executable is given, %1 is device name</extracomment>
+ <translation>Запуск на %1</translation>
+ </message>
+ <message>
+ <source>%1 (on %2)</source>
+ <extracomment>Shown in Run configuration, Add menu: &quot;name of runnable (on device name)&quot;</extracomment>
+ <translation>%1 (на %2)</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::RunControl</name>
@@ -28994,10 +29538,6 @@ Do you want to ignore them?</source>
<translation>Программа не указана.</translation>
</message>
<message>
- <source>Executable %1 does not exist.</source>
- <translation>Программа %1 отсутствует.</translation>
- </message>
- <message>
<source>Starting %1...</source>
<translation>Запускается %1...</translation>
</message>
@@ -29175,10 +29715,6 @@ These files are preserved.</source>
<context>
<name>ProjectExplorer::SshDeviceProcess</name>
<message>
- <source>Internal error</source>
- <translation>Внутренняя ошибка</translation>
- </message>
- <message>
<source>Failed to kill remote process: %1</source>
<translation>Не удалось завершить удалённый процесс: %1</translation>
</message>
@@ -29361,6 +29897,32 @@ These files are preserved.</source>
<source>None</source>
<translation>Нет</translation>
</message>
+ <message>
+ <source>Tool Chains</source>
+ <translation>Инструментарии</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::UseDyldSuffixAspect</name>
+ <message>
+ <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
+ <translation>Использовать отладочные версии библиотек (DYLD_IMAGE_SUFFIX=_debug)</translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::UseLibraryPathsAspect</name>
+ <message>
+ <source>Add build library search path to DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH</source>
+ <translation>Добавить путь к собираемой библитеке в DYLD_LIBRARY_PATH и DYLD_FRAMEWORK_PATH</translation>
+ </message>
+ <message>
+ <source>Add build library search path to PATH</source>
+ <translation>Добавить путь к собираемой библитеке в PATH</translation>
+ </message>
+ <message>
+ <source>Add build library search path to LD_LIBRARY_PATH</source>
+ <translation>Добавить путь к собираемой библитеке в LD_LIBRARY_PATH</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::UserFileHandler</name>
@@ -29467,19 +30029,16 @@ App ID: %2
<context>
<name>PythonEditor::Internal::PythonRunConfiguration</name>
<message>
- <source>Run %1</source>
- <translation>Запуск %1</translation>
+ <source>Interpreter:</source>
+ <translation>Интерпретатор:</translation>
</message>
-</context>
-<context>
- <name>PythonEditor::Internal::PythonRunConfigurationWidget</name>
<message>
- <source>Interpreter: </source>
- <translation>Интерпретатор: </translation>
+ <source>Script:</source>
+ <translation>Сценарии:</translation>
</message>
<message>
- <source>Script: </source>
- <translation>Сценарий: </translation>
+ <source>Run %1</source>
+ <translation>Запуск %1</translation>
</message>
</context>
<context>
@@ -29509,11 +30068,40 @@ App ID: %2
</message>
</context>
<context>
+ <name>QMessageBox</name>
+ <message>
+ <source>Copy to Clipboard?</source>
+ <translation>Скопировать в буфер обмена?</translation>
+ </message>
+ <message>
+ <source>Files are not automatically added to the CMakeLists.txt file of the CMake project.
+Copy the path to the source files to the clipboard?</source>
+ <translation>Файл не был автоматически добавлен в CMakeList.txt проекта CMake.
+Скопировать путь к исходному файлу в буфер обмена?</translation>
+ </message>
+</context>
+<context>
<name>QObject</name>
<message>
<source>C++ Usages:</source>
<translation>Использование C++:</translation>
</message>
+ <message>
+ <source>None</source>
+ <translation>Нет</translation>
+ </message>
+ <message>
+ <source>LF</source>
+ <translation>LF</translation>
+ </message>
+ <message>
+ <source>CR</source>
+ <translation>CR</translation>
+ </message>
+ <message>
+ <source>CRLF</source>
+ <translation>CRLF</translation>
+ </message>
</context>
<context>
<name>QSsh::Internal::SftpChannelPrivate</name>
@@ -30170,7 +30758,7 @@ App ID: %2
</message>
<message>
<source>Remove first</source>
- <translation type="unfinished">Сначала удалить</translation>
+ <translation>Сначала удалить</translation>
</message>
<message>
<source>Equivalent command line:</source>
@@ -30205,10 +30793,6 @@ App ID: %2
<context>
<name>QbsProjectManager::Internal::QbsProfilesSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Kit:</source>
<translation>Комплект:</translation>
</message>
@@ -30271,6 +30855,10 @@ App ID: %2
<source>Reading Project &quot;%1&quot;</source>
<translation>Чтение проекта «%1»</translation>
</message>
+ <message>
+ <source>Error retrieving run environment: %1</source>
+ <translation>Не удалось получить среду запуска: %1</translation>
+ </message>
</context>
<context>
<name>QbsProjectManager::Internal::QbsProjectManagerPlugin</name>
@@ -30360,32 +30948,6 @@ App ID: %2
</message>
</context>
<context>
- <name>QbsProjectManager::Internal::QbsRunConfiguration</name>
- <message>
- <source>Error retrieving run environment: %1</source>
- <translation>Не удалось получить среду запуска: %1</translation>
- </message>
- <message>
- <source>Qbs Run Configuration</source>
- <translation>Конфигурация выполнения Qbs</translation>
- </message>
-</context>
-<context>
- <name>QbsProjectManager::Internal::QbsRunConfigurationWidget</name>
- <message>
- <source>Add library paths to run environment</source>
- <translation>Добавить в среду исполнения пути к библиотекам</translation>
- </message>
- <message>
- <source>&lt;unknown&gt;</source>
- <translation>&lt;неизвестный&gt;</translation>
- </message>
- <message>
- <source>Executable:</source>
- <translation>Программа:</translation>
- </message>
-</context>
-<context>
<name>QbsRootProjectNode</name>
<message>
<source>Qbs files</source>
@@ -30509,10 +31071,6 @@ The files in the Android package source directory are copied to the build direct
<context>
<name>QmakeAndroidSupport::Internal::QmakeAndroidBuildApkWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Android</source>
<translation>Android</translation>
</message>
@@ -30558,13 +31116,6 @@ The files in the Android package source directory are copied to the build direct
</message>
</context>
<context>
- <name>QmakeAndroidSupport::Internal::QmakeAndroidRunConfiguration</name>
- <message>
- <source>The .pro file &quot;%1&quot; is currently being parsed.</source>
- <translation>Идёт обработка файла .pro: «%1».</translation>
- </message>
-</context>
-<context>
<name>QmakePriFile</name>
<message>
<source>Failed</source>
@@ -30609,10 +31160,6 @@ Please update your kit or choose a mkspec for qmake that matches your target env
<context>
<name>QmakeProjectManager::Internal::ClassDefinition</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>The header file</source>
<translation>Заголовочный файл</translation>
</message>
@@ -30835,37 +31382,6 @@ Please update your kit or choose a mkspec for qmake that matches your target env
</message>
</context>
<context>
- <name>QmakeProjectManager::Internal::DesktopQmakeRunConfigurationWidget</name>
- <message>
- <source>Executable:</source>
- <translation>Программа:</translation>
- </message>
- <message>
- <source>Run on QVFb</source>
- <translation>Запускать в QVFb</translation>
- </message>
- <message>
- <source>Check this option to run the application on a Qt Virtual Framebuffer.</source>
- <translation>Включите, для запуска приложения в Qt Virtual Framebuffer.</translation>
- </message>
- <message>
- <source>Use debug version of frameworks (DYLD_IMAGE_SUFFIX=_debug)</source>
- <translation>Использовать отладочные версии библиотек (DYLD_IMAGE_SUFFIX=_debug)</translation>
- </message>
- <message>
- <source>Add build library search path to DYLD_LIBRARY_PATH and DYLD_FRAMEWORK_PATH</source>
- <translation>Добавить путь к собираемой библитеке в DYLD_LIBRARY_PATH и DYLD_FRAMEWORK_PATH</translation>
- </message>
- <message>
- <source>Add build library search path to PATH</source>
- <translation>Добавить путь к собираемой библитеке в PATH</translation>
- </message>
- <message>
- <source>Add build library search path to LD_LIBRARY_PATH</source>
- <translation>Добавить путь к собираемой библитеке в LD_LIBRARY_PATH</translation>
- </message>
-</context>
-<context>
<name>QmakeProjectManager::Internal::DetailsPage</name>
<message>
<source>Details</source>
@@ -31463,79 +31979,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
</message>
</context>
<context>
- <name>QmakeProjectManager::Internal::TestWizard</name>
- <message>
- <source>Qt Unit Test</source>
- <translation>Юнит-тест Qt</translation>
- </message>
- <message>
- <source>Creates a QTestLib-based unit test for a feature or a class. Unit tests allow you to verify that the code is fit for use and that there are no regressions.</source>
- <translation>Создание юнит-теста основанного на QTestLib для класса или свойства. Юнит тесты позволяют проверять код на пригодность и отсутствие регрессий.</translation>
- </message>
-</context>
-<context>
- <name>QmakeProjectManager::Internal::TestWizardDialog</name>
- <message>
- <source>This wizard generates a Qt Unit Test consisting of a single source file with a test class.</source>
- <translation>Этот мастер создаст юнит-тест Qt, содержащий один исходный файл с тестовым классом.</translation>
- </message>
-</context>
-<context>
- <name>QmakeProjectManager::Internal::TestWizardPage</name>
- <message>
- <source>WizardPage</source>
- <translation></translation>
- </message>
- <message>
- <source>Specify basic information about the test class for which you want to generate skeleton source code file.</source>
- <translation>Укажите основную информацию о тестовом классе, для которого желаете создать скелет исходного файла.</translation>
- </message>
- <message>
- <source>Class name:</source>
- <translation>Имя класса:</translation>
- </message>
- <message>
- <source>Test slot:</source>
- <translation>Тестовый слот:</translation>
- </message>
- <message>
- <source>Type:</source>
- <translation>Тип:</translation>
- </message>
- <message>
- <source>Test</source>
- <translation>Тест</translation>
- </message>
- <message>
- <source>Benchmark</source>
- <translation>Замер быстродействия</translation>
- </message>
- <message>
- <source>Use a test data set</source>
- <translation>Используется набор тестовых данных</translation>
- </message>
- <message>
- <source>Requires QApplication</source>
- <translation>Требуется QApplication</translation>
- </message>
- <message>
- <source>Generate initialization and cleanup code</source>
- <translation>Создать код инициализации и очистки</translation>
- </message>
- <message>
- <source>File:</source>
- <translation>Файл:</translation>
- </message>
- <message>
- <source>Test Class Information</source>
- <translation>Информация о тестовом классе</translation>
- </message>
- <message>
- <source>Details</source>
- <translation>Подробнее</translation>
- </message>
-</context>
-<context>
<name>QmakeProjectManager::MakeStep</name>
<message>
<source>Make</source>
@@ -31768,16 +32211,8 @@ Neither the path to the library nor the path to its includes is added to the .pr
<translation>Для комплекта не задан профиль Qt.</translation>
</message>
<message>
- <source>The .pro file &quot;%1&quot; does not exist.</source>
- <translation>.pro-файл «%1» не существует.</translation>
- </message>
- <message>
- <source>The .pro file &quot;%1&quot; is not part of the project.</source>
- <translation>.pro-файл «%1» не является частью проекта.</translation>
- </message>
- <message>
- <source>The .pro file &quot;%1&quot; could not be parsed.</source>
- <translation>Не удалось разобрать .pro-файл «%1».</translation>
+ <source>No C++ compiler set in kit.</source>
+ <translation>У комплекта не задан компилятор C++.</translation>
</message>
</context>
<context>
@@ -32303,10 +32738,6 @@ Neither the path to the library nor the path to its includes is added to the .pr
<context>
<name>QmlDesigner::Internal::SettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Snapping</source>
<translation>Привязка</translation>
</message>
@@ -32562,16 +32993,16 @@ Neither the path to the library nor the path to its includes is added to the .pr
<translation>Добавить импорт %1</translation>
</message>
<message>
- <source>Add Resources</source>
- <translation>Добавление ресурсов</translation>
+ <source>All Files (%1)</source>
+ <translation>Все файлы (%1)</translation>
</message>
<message>
- <source>Target Directory</source>
- <translation>Каталог назначения</translation>
+ <source>Add Resources</source>
+ <translation>Добавление ресурсов</translation>
</message>
<message>
- <source>Failed to Add File</source>
- <translation>Не удалось добавить файл</translation>
+ <source>Failed to Add Files</source>
+ <translation>Не удалось добавить файлы</translation>
</message>
<message>
<source>Could not add %1 to project.</source>
@@ -32820,42 +33251,22 @@ This is independent of the visibility property in QML.</source>
<translation>Удалить</translation>
</message>
<message>
- <source>Delete &quot;%1&quot;</source>
- <translation>Удалить «%1»</translation>
- </message>
- <message>
<source>Cu&amp;t</source>
<translation>Выре&amp;зать</translation>
</message>
<message>
- <source>Cut &quot;%1&quot;</source>
- <translation>Вырезать «%1»</translation>
- </message>
- <message>
<source>&amp;Copy</source>
<translation>&amp;Копировать</translation>
</message>
<message>
- <source>Copy &quot;%1&quot;</source>
- <translation>Копировать «%1»</translation>
- </message>
- <message>
<source>&amp;Paste</source>
<translation>В&amp;ставить</translation>
</message>
<message>
- <source>Paste &quot;%1&quot;</source>
- <translation>Удалить «%1»</translation>
- </message>
- <message>
<source>Select &amp;All</source>
<translation>Вы&amp;делить всё</translation>
</message>
<message>
- <source>Select All &quot;%1&quot;</source>
- <translation>Выделить все «%1»</translation>
- </message>
- <message>
<source>Switch Text/Design</source>
<translation>Переключить текст/дизайн</translation>
</message>
@@ -33791,10 +34202,6 @@ For more information, see the &quot;Checking Code Syntax&quot; documentation.</s
<source>Qt Quick Designer only supports states in the root item.</source>
<translation>Qt Quick Designer поддерживает состояния только в корневом элементе.</translation>
</message>
- <message>
- <source>Using Qt Quick 1 code model instead of Qt Quick 2.</source>
- <translation>Использованием модели кода Qt Quick 1 вместо Qt Quick 2.</translation>
- </message>
</context>
<context>
<name>QmlJS::TypeDescriptionReader</name>
@@ -34167,10 +34574,6 @@ For more information, see the &quot;Checking Code Syntax&quot; documentation.</s
<context>
<name>QmlJSEditor::Internal::QmlJsEditingSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Qt Quick Toolbars</source>
<translation>Панели Qt Quick</translation>
</message>
@@ -34299,88 +34702,92 @@ the QML editor know about a likely URI.</source>
<context>
<name>QmlParser</name>
<message>
- <source>Illegal syntax for exponential number.</source>
- <translation>Некорректная форма экпоненциального числа.</translation>
+ <source>Illegal syntax for exponential number</source>
+ <translation>Некорректная форма экпоненциального числа</translation>
</message>
<message>
- <source>Stray newline in string literal.</source>
- <translation>Неожиданный конец строки в строковом литерале.</translation>
+ <source>Stray newline in string literal</source>
+ <translation>Неожиданный конец строки в строковом литерале</translation>
</message>
<message>
- <source>Illegal unicode escape sequence.</source>
- <translation>Недопустимая ESC-последовательность юникода.</translation>
+ <source>End of file reached at escape sequence</source>
+ <translation>Файл закончился внутри ESC-последовательности</translation>
</message>
<message>
- <source>Illegal hexadecimal escape sequence.</source>
- <translation>Недопустимая шестнадцатеричная ESC-последовательность.</translation>
+ <source>Illegal unicode escape sequence</source>
+ <translation>Недопустимая ESC-последовательность юникода</translation>
</message>
<message>
- <source>Octal escape sequences are not allowed.</source>
- <translation>Восьмеричные ESC-последовательности недопустимы.</translation>
+ <source>Illegal hexadecimal escape sequence</source>
+ <translation>Недопустимая шестнадцатеричная ESC-последовательность</translation>
</message>
<message>
- <source>Unclosed string at end of line.</source>
- <translation>Незакрытый литерал в конце строки.</translation>
+ <source>Octal escape sequences are not allowed</source>
+ <translation>Восьмеричные ESC-последовательности недопустимы</translation>
</message>
<message>
- <source>Decimal numbers cannot start with &quot;0&quot;.</source>
- <translation>Десятичные числа не могут начинаться с «0».</translation>
+ <source>Unclosed string at end of line</source>
+ <translation>Незакрытый литерал в конце строки</translation>
</message>
<message>
- <source>At least one hexadecimal digit is required after &quot;0%1&quot;.</source>
- <translation>Требуется как минимум одна шестнадцатеричная цифра после «0%1».</translation>
+ <source>Decimal numbers can&apos;t start with &apos;0&apos;</source>
+ <translation>Десятичные числа не могут начинаться с «0»</translation>
</message>
<message>
- <source>Invalid regular expression flag &quot;%0&quot;.</source>
- <translation>Некорректный флаг регулярного выражения «%0».</translation>
+ <source>At least one hexadecimal digit is required after &apos;0%1&apos;</source>
+ <translation>Требуется как минимум одна шестнадцатеричная цифра после «0%1»</translation>
</message>
<message>
- <source>Unterminated regular expression backslash sequence.</source>
- <translation>В регулярном выражении последовательность за обратным слэшем не завершена.</translation>
+ <source>Invalid regular expression flag &apos;%0&apos;</source>
+ <translation>Некорректный флаг регулярного выражения «%0»</translation>
</message>
<message>
- <source>Unterminated regular expression class.</source>
- <translation>Незавершённый класс регулярного выражения.</translation>
+ <source>Unterminated regular expression backslash sequence</source>
+ <translation>В регулярном выражении последовательность за обратным слэшем не завершена</translation>
</message>
<message>
- <source>Unterminated regular expression literal.</source>
- <translation>Незавершённый литерал регулярного выражения.</translation>
+ <source>Unterminated regular expression class</source>
+ <translation>Незавершённый класс регулярного выражения</translation>
</message>
<message>
- <source>Syntax error.</source>
- <translation>Синтаксическая ошибка.</translation>
+ <source>Unterminated regular expression literal</source>
+ <translation>Незавершённый литерал регулярного выражения</translation>
</message>
<message>
- <source>Imported file must be a script.</source>
- <translation>Импортированный файл должен быть скриптом.</translation>
+ <source>Syntax error</source>
+ <translation>Синтаксическая ошибка</translation>
</message>
<message>
- <source>Invalid module URI.</source>
- <translation>Неверный URI модуля.</translation>
+ <source>Imported file must be a script</source>
+ <translation>Импортированный файл должен быть скриптом</translation>
</message>
<message>
- <source>Module import requires a version.</source>
- <translation>При импорте модуля требуется версия.</translation>
+ <source>Invalid module URI</source>
+ <translation>Неверный URI модуля</translation>
</message>
<message>
- <source>File import requires a qualifier.</source>
- <translation>При импорте файла требуется спецификатор.</translation>
+ <source>Module import requires a version</source>
+ <translation>При импорте модуля требуется версия</translation>
</message>
<message>
- <source>Module import requires a qualifier.</source>
- <translation>При импорте модуля требуется спецификатор.</translation>
+ <source>File import requires a qualifier</source>
+ <translation>При импорте файла требуется спецификатор</translation>
</message>
<message>
- <source>Invalid import qualifier.</source>
- <translation>Неверный спецификатор импорта.</translation>
+ <source>Module import requires a qualifier</source>
+ <translation>При импорте модуля требуется спецификатор</translation>
</message>
<message>
- <source>Unexpected token &quot;%1&quot;.</source>
- <translation>Неожиданная лексема «%1».</translation>
+ <source>Invalid import qualifier</source>
+ <translation>Неверный спецификатор импорта</translation>
</message>
<message>
- <source>Expected token &quot;%1&quot;.</source>
- <translation>Ожидаемая лексема «%1».</translation>
+ <source>Unexpected token `%1&apos;</source>
+ <translation>Неожиданная лексема «%1»</translation>
+ </message>
+ <message>
+ <source>Expected token `%1&apos;</source>
+ <translation>Ожидается лексема «%1»</translation>
</message>
</context>
<context>
@@ -34420,8 +34827,8 @@ the QML editor know about a likely URI.</source>
<context>
<name>QmlProfiler::Internal::FlameGraphModel</name>
<message>
- <source>Could not re-read events from temporary trace file.</source>
- <translation>Не удалось перечитать события из временного файла трассировки.</translation>
+ <source>Could not re-read events from temporary trace file: %1</source>
+ <translation>Не удалось перечитать события из временного файла трассировки: %1</translation>
</message>
<message>
<source>Compile</source>
@@ -34657,18 +35064,14 @@ the QML editor know about a likely URI.</source>
<translation>Всего</translation>
</message>
<message numerus="yes">
- <source>%n bytes</source>
+ <source>%1 byte(s)</source>
<translation>
- <numerusform>%n байт</numerusform>
- <numerusform>%n байта</numerusform>
- <numerusform>%n байтов</numerusform>
+ <numerusform>%1 байт</numerusform>
+ <numerusform>%1 байта</numerusform>
+ <numerusform>%1 байт</numerusform>
</translation>
</message>
<message>
- <source>%1 bytes</source>
- <translation>%1 байт</translation>
- </message>
- <message>
<source>Allocated</source>
<translation>Выделено</translation>
</message>
@@ -34723,9 +35126,13 @@ the QML editor know about a likely URI.</source>
<source>Total</source>
<translation>Всего</translation>
</message>
- <message>
- <source>%1 bytes</source>
- <translation>%1 байт</translation>
+ <message numerus="yes">
+ <source>%1 byte(s)</source>
+ <translation>
+ <numerusform>%1 байт</numerusform>
+ <numerusform>%1 байта</numerusform>
+ <numerusform>%1 байт</numerusform>
+ </translation>
</message>
<message>
<source>Allocated</source>
@@ -34839,6 +35246,33 @@ the QML editor know about a likely URI.</source>
</message>
</context>
<context>
+ <name>QmlProfiler::Internal::QmlProfilerActions</name>
+ <message>
+ <source>The QML Profiler can be used to find performance bottlenecks in applications using QML.</source>
+ <translation>QML Profiler предназначен для поиска узких мест в приложениях использующих QML.</translation>
+ </message>
+ <message>
+ <source>QML Profiler</source>
+ <translation>Профайлер QML</translation>
+ </message>
+ <message>
+ <source>QML Profiler (Attach to Waiting Application)</source>
+ <translation>Профайлер QML (подключение к ожидающему приложению)</translation>
+ </message>
+ <message>
+ <source>Load QML Trace</source>
+ <translation>Загрузить трассировку QML</translation>
+ </message>
+ <message>
+ <source>Save QML Trace</source>
+ <translation>Сохранить трассировку QML</translation>
+ </message>
+ <message>
+ <source>QML Profiler Options</source>
+ <translation>Настройки профайлера QML</translation>
+ </message>
+</context>
+<context>
<name>QmlProfiler::Internal::QmlProfilerAnimationsModel</name>
<message>
<source>Animations</source>
@@ -34934,40 +35368,6 @@ itself takes time.</source>
</message>
</context>
<context>
- <name>QmlProfiler::Internal::QmlProfilerFileReader</name>
- <message>
- <source>Error while parsing trace data file: %1</source>
- <translation>Ошибка разбора файла данных трассировки: %1</translation>
- </message>
- <message>
- <source>Invalid magic: %1</source>
- <translation>Неверный признак (magic): %1</translation>
- </message>
- <message>
- <source>Unknown data stream version: %1</source>
- <translation>Неизвестная версия потока данных: %1</translation>
- </message>
- <message>
- <source>Invalid type index %1</source>
- <translation>Неверный индекс типа %1</translation>
- </message>
- <message>
- <source>Corrupt data before position %1.</source>
- <translation>Повреждены данные перед позицией %1.</translation>
- </message>
-</context>
-<context>
- <name>QmlProfiler::Internal::QmlProfilerFileWriter</name>
- <message>
- <source>Could not re-read events from temporary trace file. Saving failed.</source>
- <translation>Не удалось перечитать события из временного файла трассировки. Ошибка сохранения.</translation>
- </message>
- <message>
- <source>Error writing trace file.</source>
- <translation>Ошибка записи файла трассировки.</translation>
- </message>
-</context>
-<context>
<name>QmlProfiler::Internal::QmlProfilerOptionsPage</name>
<message>
<source>QML Profiler</source>
@@ -35011,10 +35411,6 @@ itself takes time.</source>
<source>No QML events recorded</source>
<translation>События QML не записаны</translation>
</message>
- <message>
- <source>Processing data: %1 / %2</source>
- <translation>Обработка данных: %1 / %2</translation>
- </message>
<message numerus="yes">
<source>Loading buffered data: %n events</source>
<translation>
@@ -35023,10 +35419,6 @@ itself takes time.</source>
<numerusform>Загрузка буферизованных данных: %n событий</numerusform>
</translation>
</message>
- <message>
- <source>Clearing old trace</source>
- <translation>Очистка старой трассировки</translation>
- </message>
<message numerus="yes">
<source>Loading offline data: %n events</source>
<translation>
@@ -35041,132 +35433,6 @@ itself takes time.</source>
</message>
</context>
<context>
- <name>QmlProfiler::Internal::QmlProfilerStatisticsMainView</name>
- <message>
- <source>&lt;program&gt;</source>
- <translation>&lt;программа&gt;</translation>
- </message>
- <message>
- <source>Main Program</source>
- <translation>Основная программа</translation>
- </message>
- <message>
- <source>Callee</source>
- <translation>Вызываемое</translation>
- </message>
- <message>
- <source>Callee Description</source>
- <translation>Описание вызываемого</translation>
- </message>
- <message>
- <source>Caller</source>
- <translation>Вызывающее</translation>
- </message>
- <message>
- <source>Caller Description</source>
- <translation>Описание вызывающего</translation>
- </message>
- <message>
- <source>Calls</source>
- <translation>Вызовы</translation>
- </message>
- <message>
- <source>Details</source>
- <translation>Подробнее</translation>
- </message>
- <message>
- <source>Location</source>
- <translation>Размещение</translation>
- </message>
- <message>
- <source>Longest Time</source>
- <translation>Наибольшее время</translation>
- </message>
- <message>
- <source>Mean Time</source>
- <translation>Среднее время</translation>
- </message>
- <message>
- <source>Self Time</source>
- <translation>Собственное время</translation>
- </message>
- <message>
- <source>Self Time in Percent</source>
- <translation>Собственное время в процентах</translation>
- </message>
- <message>
- <source>Shortest Time</source>
- <translation>Наименьше время</translation>
- </message>
- <message>
- <source>Time in Percent</source>
- <translation>Время в процентах</translation>
- </message>
- <message>
- <source>Total Time</source>
- <translation>Общее время</translation>
- </message>
- <message>
- <source>Type</source>
- <translation>Тип</translation>
- </message>
- <message>
- <source>Median Time</source>
- <translation>Медианное время</translation>
- </message>
- <message>
- <source>&lt;bytecode&gt;</source>
- <translation>&lt;байтовый код&gt;</translation>
- </message>
- <message>
- <source>Source code not available</source>
- <translation>Исходники недоступны</translation>
- </message>
- <message>
- <source>Painting</source>
- <translation>Отрисовка</translation>
- </message>
- <message>
- <source>Compiling</source>
- <translation>Компиляция</translation>
- </message>
- <message>
- <source>Creating</source>
- <translation>Создание</translation>
- </message>
- <message>
- <source>Handling Signal</source>
- <translation>Обработка сигнала</translation>
- </message>
- <message>
- <source>Binding</source>
- <translation>Привязка</translation>
- </message>
- <message>
- <source>+%1 in recursive calls</source>
- <translation>+%1 в рекурсивых вызовах</translation>
- </message>
- <message>
- <source>JavaScript</source>
- <translation>JavaScript</translation>
- </message>
-</context>
-<context>
- <name>QmlProfiler::Internal::QmlProfilerStatisticsRelativesView</name>
- <message>
- <source>&lt;bytecode&gt;</source>
- <translation>&lt;байтовый код&gt;</translation>
- </message>
- <message>
- <source>Source code not available</source>
- <translation>Исходники недоступны</translation>
- </message>
- <message>
- <source>called recursively</source>
- <translation>вызывается рекурсивно</translation>
- </message>
-</context>
-<context>
<name>QmlProfiler::Internal::QmlProfilerStatisticsView</name>
<message>
<source>Statistics</source>
@@ -35196,26 +35462,14 @@ itself takes time.</source>
<translation>Профайлер QML</translation>
</message>
<message>
- <source>The QML Profiler can be used to find performance bottlenecks in applications using QML.</source>
- <translation>QML Profiler предназначен для поиска узких мест в приложениях использующих QML.</translation>
- </message>
- <message>
<source>Load QML Trace</source>
<translation>Загрузить трассировку QML</translation>
</message>
<message>
- <source>QML Profiler Options</source>
- <translation>Настройки профайлера QML</translation>
- </message>
- <message>
<source>Save QML Trace</source>
<translation>Сохранить трассировку QML</translation>
</message>
<message>
- <source>QML Profiler (Attach to Waiting Application)</source>
- <translation>Профайлер QML (подключение к ожидающему приложению)</translation>
- </message>
- <message>
<source>A QML Profiler analysis is still in progress.</source>
<translation>Выполняется профилирование QML.</translation>
</message>
@@ -35224,12 +35478,6 @@ itself takes time.</source>
<translation>Начать профилирование QML.</translation>
</message>
<message>
- <source>Could not connect to the in-process QML profiler.
-Do you want to retry?</source>
- <translation>Не удалось подключиться к внутрипроцессному профайлеру QML.
-Повторить?</translation>
- </message>
- <message>
<source>Failed to connect.</source>
<translation>Не удалось подключиться.</translation>
</message>
@@ -35242,6 +35490,16 @@ Do you want to retry?</source>
<translation>Включить профилирование</translation>
</message>
<message>
+ <source>The application finished before a connection could be established. No data was loaded.</source>
+ <translation>Приложение завершилось до установки соединения. Данные не были загружены.</translation>
+ </message>
+ <message>
+ <source>Could not connect to the in-process QML profiler within %1 s.
+Do you want to retry and wait %2 s?</source>
+ <translation>Не удалось подключиться к внутрипроцессному профайлеру QML в течение %1 с.
+Повторить и ждать %2 с?</translation>
+ </message>
+ <message>
<source>%1 s</source>
<translation>%1 сек</translation>
</message>
@@ -35254,6 +35512,14 @@ Do you want to retry?</source>
<translation>Трассировки QML (*%1 *%2)</translation>
</message>
<message>
+ <source>Saving Trace Data</source>
+ <translation>Сохранение данных трассировки</translation>
+ </message>
+ <message>
+ <source>Loading Trace Data</source>
+ <translation>Загрузка данных трассировки</translation>
+ </message>
+ <message>
<source>You are about to discard the profiling data, including unsaved notes. Do you want to continue?</source>
<translation>Продолжить с потерей данных профилирования и несохранённых заметок?</translation>
</message>
@@ -35283,6 +35549,43 @@ Do you want to save the data first?</source>
</message>
</context>
<context>
+ <name>QmlProfiler::Internal::QmlProfilerTraceFile</name>
+ <message>
+ <source>Error while parsing trace data file: %1</source>
+ <translation>Ошибка разбора файла данных трассировки: %1</translation>
+ </message>
+ <message>
+ <source>Invalid magic: %1</source>
+ <translation>Неверный признак (magic): %1</translation>
+ </message>
+ <message>
+ <source>Unknown data stream version: %1</source>
+ <translation>Неизвестная версия потока данных: %1</translation>
+ </message>
+ <message>
+ <source>Excessive number of event types: %1</source>
+ <translation>Чрезмерное число типов событий: %1</translation>
+ </message>
+ <message>
+ <source>Invalid type index %1</source>
+ <translation>Неверный индекс типа %1</translation>
+ </message>
+ <message>
+ <source>Corrupt data before position %1.</source>
+ <translation>Повреждены данные перед позицией %1.</translation>
+ </message>
+ <message>
+ <source>Error writing trace file.</source>
+ <translation>Ошибка записи файла трассировки.</translation>
+ </message>
+ <message>
+ <source>Could not re-read events from temporary trace file: %s
+Saving failed.</source>
+ <translation>Не удалось перечитать события из временного файла трассировки: %s
+Сохранение не удалось.</translation>
+ </message>
+</context>
+<context>
<name>QmlProfiler::Internal::QmlProfilerTraceView</name>
<message>
<source>Timeline</source>
@@ -35326,8 +35629,8 @@ Do you want to save the data first?</source>
<context>
<name>QmlProfiler::QmlProfilerModelManager</name>
<message>
- <source>Cannot open temporary trace file to store events.</source>
- <translation>Не удалось открыть временный файл для хранения событий.</translation>
+ <source>Failed to replay QML events from stash file.</source>
+ <translation>Не удалось проиграть события QML из файла stash.</translation>
</message>
<message>
<source>&lt;bytecode&gt;</source>
@@ -35338,39 +35641,173 @@ Do you want to save the data first?</source>
<translation>анонимная функция</translation>
</message>
<message>
- <source>GUI Thread</source>
- <translation>Поток GUI</translation>
+ <source>Read past end in temporary trace file.</source>
+ <translation>Чтение за концом временного файла трассировки.</translation>
</message>
+</context>
+<context>
+ <name>QmlProfiler::QmlProfilerStatisticsModel</name>
<message>
- <source>Could not open %1 for writing.</source>
- <translation>Не удалось открыть %1 для записи.</translation>
+ <source>Painting</source>
+ <translation>Отрисовка</translation>
</message>
<message>
- <source>Saving Trace Data</source>
- <translation>Сохранение данных трассировки</translation>
+ <source>Compiling</source>
+ <translation>Компиляция</translation>
</message>
<message>
- <source>Could not open %1 for reading.</source>
- <translation>Не удалось открыть %1 для чтения.</translation>
+ <source>Creating</source>
+ <translation>Создание</translation>
</message>
<message>
- <source>Loading Trace Data</source>
- <translation>Загрузка данных трассировки</translation>
+ <source>Binding</source>
+ <translation>Привязка</translation>
+ </message>
+ <message>
+ <source>Handling Signal</source>
+ <translation>Обработка сигнала</translation>
+ </message>
+ <message>
+ <source>JavaScript</source>
+ <translation>JavaScript</translation>
+ </message>
+ <message>
+ <source>Could not re-read events from temporary trace file: %1</source>
+ <translation>Не удалось перечитать события из временного файла трассировки: %1</translation>
+ </message>
+ <message>
+ <source>Main program</source>
+ <translation>Основная программа</translation>
+ </message>
+ <message>
+ <source>+%1 in recursive calls</source>
+ <translation>+%1 в рекурсивых вызовах</translation>
+ </message>
+ <message>
+ <source>&lt;bytecode&gt;</source>
+ <translation>&lt;байтовый код&gt;</translation>
+ </message>
+ <message>
+ <source>Source code not available</source>
+ <translation>Исходники недоступны</translation>
+ </message>
+ <message>
+ <source>Calls</source>
+ <translation>Вызовы</translation>
+ </message>
+ <message>
+ <source>Details</source>
+ <translation>Подробности</translation>
+ </message>
+ <message>
+ <source>Location</source>
+ <translation>Размещение</translation>
+ </message>
+ <message>
+ <source>Longest Time</source>
+ <translation>Наибольшее время</translation>
+ </message>
+ <message>
+ <source>Mean Time</source>
+ <translation>Среднее время</translation>
</message>
<message>
- <source>Trying to set unknown state in events list.</source>
- <translation>Попытка установить неизвестное состояние в списке событий.</translation>
+ <source>Self Time</source>
+ <translation>Собственное время</translation>
</message>
<message>
- <source>Could not re-read events from temporary trace file. The trace data is lost.</source>
- <translation>Не удалось перечитать события из временного файла трассировки. Данные трассировки утеряны.</translation>
+ <source>Self Time in Percent</source>
+ <translation>Собственное время в процентах</translation>
+ </message>
+ <message>
+ <source>Shortest Time</source>
+ <translation>Наименьше время</translation>
+ </message>
+ <message>
+ <source>Time in Percent</source>
+ <translation>Время в процентах</translation>
+ </message>
+ <message>
+ <source>Total Time</source>
+ <translation>Общее время</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>Тип</translation>
+ </message>
+ <message>
+ <source>Median Time</source>
+ <translation>Медианное время</translation>
</message>
</context>
<context>
- <name>QmlProfiler::QmlProfilerStatisticsModel</name>
+ <name>QmlProfiler::QmlProfilerStatisticsRelativesModel</name>
+ <message>
+ <source>Main Program</source>
+ <translation>Основная программа</translation>
+ </message>
+ <message>
+ <source>called recursively</source>
+ <translation>вызывается рекурсивно</translation>
+ </message>
<message>
- <source>Could not re-read events from temporary trace file.</source>
- <translation>Не удалось перечитать события из временного файла трассировки.</translation>
+ <source>&lt;bytecode&gt;</source>
+ <translation>&lt;байтовый код&gt;</translation>
+ </message>
+ <message>
+ <source>Source code not available</source>
+ <translation>Исходники недоступны</translation>
+ </message>
+ <message>
+ <source>Callee</source>
+ <translation>Вызываемое</translation>
+ </message>
+ <message>
+ <source>Caller</source>
+ <translation>Вызывающее</translation>
+ </message>
+ <message>
+ <source>Type</source>
+ <translation>Тип</translation>
+ </message>
+ <message>
+ <source>Total Time</source>
+ <translation>Общее время</translation>
+ </message>
+ <message>
+ <source>Calls</source>
+ <translation>Вызовы</translation>
+ </message>
+ <message>
+ <source>Callee Description</source>
+ <translation>Описание вызываемого</translation>
+ </message>
+ <message>
+ <source>Caller Description</source>
+ <translation>Описание вызывающего</translation>
+ </message>
+</context>
+<context>
+ <name>QmlProfilerEventStorage</name>
+ <message>
+ <source>Cannot open temporary trace file to store events.</source>
+ <translation>Не удалось открыть временный файл для хранения событий.</translation>
+ </message>
+ <message>
+ <source>Failed to reset temporary trace file.</source>
+ <translation>Не удалось сбросить временный файл трассировки.</translation>
+ </message>
+ <message>
+ <source>Failed to flush temporary trace file.</source>
+ <translation>Не удалось записать временный файл трассировки.</translation>
+ </message>
+ <message>
+ <source>Could not re-open temporary trace file.</source>
+ <translation>Не удалось переоткрыть временный файл трассировки.</translation>
+ </message>
+ <message>
+ <source>Read past end in temporary trace file.</source>
+ <translation>Чтение за концом временного файла трассировки.</translation>
</message>
</context>
<context>
@@ -35412,12 +35849,8 @@ Do you want to save the data first?</source>
<translation>Разные события</translation>
</message>
<message>
- <source>No data available</source>
- <translation>Нет данных</translation>
- </message>
- <message>
- <source>Visualize %1</source>
- <translation>Отобразить %1</translation>
+ <source>others</source>
+ <translation>другие</translation>
</message>
</context>
<context>
@@ -35428,13 +35861,6 @@ Do you want to save the data first?</source>
</message>
</context>
<context>
- <name>QmlProjectManager::Internal::QmlProjectRunConfigurationFactory</name>
- <message>
- <source>QML Scene</source>
- <translation>QML Scene</translation>
- </message>
-</context>
-<context>
<name>QmlProjectManager::Internal::QmlProjectRunConfigurationWidget</name>
<message>
<source>Arguments:</source>
@@ -35456,10 +35882,22 @@ Do you want to save the data first?</source>
<translation>Предупреждение при загрузке файла проекта %1.</translation>
</message>
<message>
+ <source>Kit has no device.</source>
+ <translation>У комплекта не задано устройство.</translation>
+ </message>
+ <message>
<source>Qt version is too old.</source>
<translation>Версия Qt слишком стара.</translation>
</message>
<message>
+ <source>Qt version has no qmlscene command.</source>
+ <translation>У профиля Qt нет команды qmlscene.</translation>
+ </message>
+ <message>
+ <source>Non-desktop Qt is used with a desktop device.</source>
+ <translation>Ненастольный профиль Qt используется для настольного устройства.</translation>
+ </message>
+ <message>
<source>No Qt version set in kit.</source>
<translation>Для комплекта не задан профиль Qt.</translation>
</message>
@@ -35471,8 +35909,8 @@ Do you want to save the data first?</source>
<translation>Системная среда</translation>
</message>
<message>
- <source>Kit Environment</source>
- <translation>Среда комплекта</translation>
+ <source>Clean Environment</source>
+ <translation>Чистая среда</translation>
</message>
</context>
<context>
@@ -35498,6 +35936,10 @@ Do you want to save the data first?</source>
<translation>Не задана программа qmlscene для целевого устройства.</translation>
</message>
<message>
+ <source>QML Scene</source>
+ <translation>QML Scene</translation>
+ </message>
+ <message>
<source>No script file to execute.</source>
<translation>Нет файла сценария для запуска.</translation>
</message>
@@ -35564,7 +36006,7 @@ Do you want to save the data first?</source>
</message>
</context>
<context>
- <name>Qnx::Internal::QnxDeployConfigurationFactory</name>
+ <name>Qnx::Internal::QnxDeployConfiguration</name>
<message>
<source>Deploy to QNX Device</source>
<translation>Установить на устройство QNX</translation>
@@ -35702,15 +36144,8 @@ Are you sure you want to continue?</source>
<context>
<name>Qnx::Internal::QnxRunConfiguration</name>
<message>
- <source>Path to Qt libraries on device:</source>
- <translation>Путь к библиотекам Qt на устройстве:</translation>
- </message>
-</context>
-<context>
- <name>Qnx::Internal::QnxRunConfigurationFactory</name>
- <message>
- <source>%1 on QNX Device</source>
- <translation>%1 на устройстве QNX</translation>
+ <source>Path to Qt libraries on device</source>
+ <translation>Путь к библиотекам Qt на устройстве</translation>
</message>
</context>
<context>
@@ -35723,10 +36158,6 @@ Are you sure you want to continue?</source>
<context>
<name>Qnx::Internal::QnxSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Generate kits</source>
<translation>Создать комплекты</translation>
</message>
@@ -36012,10 +36443,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf
<context>
<name>QtSupport::Internal::CodeGenSettingsPageWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Embedding of the UI Class</source>
<translation>Встраивание класса UI</translation>
</message>
@@ -36713,10 +37140,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf
<context>
<name>RemoteLinux::GenericLinuxDeviceConfigurationWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Authentication type:</source>
<translation>Тип авторизации:</translation>
</message>
@@ -36996,40 +37419,25 @@ In addition, device connectivity will be tested.</source>
<context>
<name>RemoteLinux::Internal::RemoteLinuxCustomRunConfiguration</name>
<message>
- <source>The remote executable must be set in order to run a custom remote run configuration.</source>
- <translatorcomment>Идей как это перевести дословно и красиво у меня нет</translatorcomment>
- <translation>Для запуска внешнего приложения его необходимо задать.</translation>
- </message>
- <message>
- <source>Run &quot;%1&quot; on Linux Device</source>
- <translation>Выполнить «%1» на Linux-устройстве</translation>
- </message>
- <message>
- <source>Custom Executable (on Remote Generic Linux Host)</source>
- <translation>Особая программа (на удалённом обычном Linux-узле)</translation>
- </message>
-</context>
-<context>
- <name>RemoteLinux::Internal::RemoteLinuxCustomRunConfigurationWidget</name>
- <message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
- <source>Arguments:</source>
- <translation>Параметры:</translation>
+ <source>Remote executable:</source>
+ <translation>Внешняя программа:</translation>
</message>
<message>
<source>Local executable:</source>
<translation>Локальная программа:</translation>
</message>
<message>
- <source>Remote executable:</source>
- <translation>Внешняя программа:</translation>
+ <source>The remote executable must be set in order to run a custom remote run configuration.</source>
+ <translatorcomment>Идей как это перевести дословно и красиво у меня нет</translatorcomment>
+ <translation>Для запуска внешнего приложения его необходимо задать.</translation>
</message>
<message>
- <source>Working directory:</source>
- <translation>Рабочий каталог:</translation>
+ <source>Custom Executable</source>
+ <translation>Особая программа</translation>
+ </message>
+ <message>
+ <source>Run &quot;%1&quot;</source>
+ <translation>Запустить «%1»</translation>
</message>
</context>
<context>
@@ -37056,13 +37464,6 @@ In addition, device connectivity will be tested.</source>
</message>
</context>
<context>
- <name>RemoteLinux::Internal::RemoteLinuxRunConfigurationFactory</name>
- <message>
- <source>%1 (on Remote Generic Linux Host)</source>
- <translation>%1 (на удалённой машине с Linux)</translation>
- </message>
-</context>
-<context>
<name>RemoteLinux::Internal::TypeSpecificDeviceConfigurationListModel</name>
<message>
<source>%1 (default)</source>
@@ -37216,53 +37617,17 @@ In addition, device connectivity will be tested.</source>
<context>
<name>RemoteLinux::RemoteLinuxRunConfiguration</name>
<message>
- <source>%1 (on Remote Device)</source>
- <translation>%1 (на внешнем устройстве)</translation>
- </message>
- <message>
- <source>Run on Remote Device</source>
- <extracomment>Remote Linux run configuration default display name</extracomment>
- <translation>Запуск на внешнем устройстве</translation>
- </message>
-</context>
-<context>
- <name>RemoteLinux::RemoteLinuxRunConfigurationWidget</name>
- <message>
- <source>Executable on host:</source>
- <translation>Программа на машине:</translation>
- </message>
- <message>
<source>Executable on device:</source>
<translation>Программа на устройстве:</translation>
</message>
<message>
- <source>Use this command instead</source>
- <translation>Используйте эту команду</translation>
- </message>
- <message>
- <source>Alternate executable on device:</source>
- <translation>Сменить программу на устройстве:</translation>
- </message>
- <message>
- <source>Arguments:</source>
- <translation>Параметры:</translation>
- </message>
- <message>
- <source>&lt;default&gt;</source>
- <translation>&lt;по умолчанию&gt;</translation>
- </message>
- <message>
- <source>Working directory:</source>
- <translation>Рабочий каталог:</translation>
- </message>
- <message>
- <source>Unknown</source>
- <translation>Неизвестная</translation>
- </message>
- <message>
<source>Remote path not set</source>
<translation>Не задан внешний путь</translation>
</message>
+ <message>
+ <source>Executable on host:</source>
+ <translation>Программа на машине:</translation>
+ </message>
</context>
<context>
<name>RemoteLinux::RemoteLinuxSignalOperation</name>
@@ -37351,10 +37716,6 @@ In addition, device connectivity will be tested.</source>
<context>
<name>RemoteLinuxCheckForFreeDiskSpaceStepWidget</name>
<message>
- <source>Form</source>
- <translation>Форма</translation>
- </message>
- <message>
<source>Remote path to check for free space:</source>
<translation>Внешний путь для проверки свободного места:</translation>
</message>
@@ -37618,10 +37979,6 @@ In addition, device connectivity will be tested.</source>
<context>
<name>ScxmlEditor::Common::ColorSettings</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>+</source>
<translation>+</translation>
</message>
@@ -37726,13 +38083,6 @@ In addition, device connectivity will be tested.</source>
</message>
</context>
<context>
- <name>ScxmlEditor::Common::Magnifier</name>
- <message>
- <source>Form</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>ScxmlEditor::Common::MainWidget</name>
<message>
<source>State Color</source>
@@ -37816,10 +38166,6 @@ In addition, device connectivity will be tested.</source>
<context>
<name>ScxmlEditor::Common::Search</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Enter search term</source>
<translation>Введите термин для поиска</translation>
</message>
@@ -37860,10 +38206,6 @@ In addition, device connectivity will be tested.</source>
<context>
<name>ScxmlEditor::Common::StateView</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Back</source>
<translation>Назад</translation>
</message>
@@ -37871,10 +38213,6 @@ In addition, device connectivity will be tested.</source>
<context>
<name>ScxmlEditor::Common::Statistics</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Time</source>
<translation>Время</translation>
</message>
@@ -38549,6 +38887,83 @@ Row: %4, Column: %5
</message>
</context>
<context>
+ <name>SerialTerminal::Internal::SerialControl</name>
+ <message>
+ <source>Unable to open port %1.</source>
+ <translation>Не удалось открыть порт %1.</translation>
+ </message>
+ <message>
+ <source>Session resumed.</source>
+ <translation>Сессия восстановлена.</translation>
+ </message>
+ <message>
+ <source>Starting new session on %1...</source>
+ <translation>Запуск новой сессии на %1...</translation>
+ </message>
+ <message>
+ <source>Session finished on %1.</source>
+ <translation>Сессия завершилась на %1.</translation>
+ </message>
+ <message>
+ <source>Session paused...</source>
+ <translation>Сессия приостановлена...</translation>
+ </message>
+ <message>
+ <source>No Port</source>
+ <translation>Без порта</translation>
+ </message>
+ <message>
+ <source>Serial port error: %1 (%2)</source>
+ <translation>Ошибка последовательного порта: %1 (%2)</translation>
+ </message>
+</context>
+<context>
+ <name>SerialTerminal::Internal::SerialOutputPane</name>
+ <message>
+ <source>Close Tab</source>
+ <translation>Закрыть вкладку</translation>
+ </message>
+ <message>
+ <source>Close All Tabs</source>
+ <translation>Закрыть все вкладки</translation>
+ </message>
+ <message>
+ <source>Close Other Tabs</source>
+ <translation>Закрыть другие вкладки</translation>
+ </message>
+ <message>
+ <source>Type text and hit Enter to send.</source>
+ <translation>Для отправки введите текст и нажмите Ввод.</translation>
+ </message>
+ <message>
+ <source>Serial Terminal Window</source>
+ <translation>Окно последовательной консоли</translation>
+ </message>
+ <message>
+ <source>Connect</source>
+ <translation>Подключиться</translation>
+ </message>
+ <message>
+ <source>Disconnect</source>
+ <translation>Отключиться</translation>
+ </message>
+ <message>
+ <source>Reset Board</source>
+ <translation>Сбросить плату</translation>
+ </message>
+ <message>
+ <source>Add New Terminal</source>
+ <translation>Добавить новую консоль</translation>
+ </message>
+</context>
+<context>
+ <name>SerialTerminal::Internal::SerialTerminalOutputPane</name>
+ <message>
+ <source>Serial Terminal</source>
+ <translation>Последовательная консоль</translation>
+ </message>
+</context>
+<context>
<name>SilverSearcher::FindInFilesSilverSearcher</name>
<message>
<source>Silver Searcher is not available on the system.</source>
@@ -39144,6 +39559,10 @@ with a password, which you can enter below.</source>
<translation>Проект &lt;b&gt;%1&lt;/b&gt; ещё не настроен.&lt;br/&gt;Для обработки проекта %2 использует &lt;b&gt;неверный&lt;/b&gt; комплект &lt;b&gt;%3&lt;/b&gt;.</translation>
</message>
<message>
+ <source>Kit is unsuited for project</source>
+ <translation>Комплект не подходит проекту</translation>
+ </message>
+ <message>
<source>Click to activate:</source>
<translation>Щёлкните для активации:</translation>
</message>
@@ -39226,6 +39645,7 @@ with a password, which you can enter below.</source>
</message>
<message>
<source>My Tasks</source>
+ <extracomment>Category under which tasklist tasks are listed in Issues view</extracomment>
<translation>Мои задачи</translation>
</message>
</context>
@@ -39568,13 +39988,6 @@ Excluding: %3
</message>
</context>
<context>
- <name>TextEditor::Internal::BehaviorSettingsPage</name>
- <message>
- <source>Form</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>TextEditor::Internal::BehaviorSettingsWidget</name>
<message>
<source>Typing</source>
@@ -39804,10 +40217,6 @@ Specifies how backspace interacts with indentation.
<context>
<name>TextEditor::Internal::CodeStyleSelectorWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Current settings:</source>
<translation>Текущие настройки:</translation>
</message>
@@ -40280,10 +40689,6 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
<context>
<name>TextEditor::Internal::HighlighterSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
&lt;p&gt;Highlight definitions are provided by the &lt;a href=&quot;http://kate-editor.org/&quot;&gt;Kate Text Editor&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
@@ -40458,6 +40863,11 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
<translation>и else</translation>
</message>
<message>
+ <source>with closing brace comment</source>
+ <comment>group:&apos;C++&apos; trigger:&apos;namespace&apos;</comment>
+ <translation>с комментарием закрывающей скобки</translation>
+ </message>
+ <message>
<source>and catch</source>
<comment>group:&apos;C++&apos; trigger:&apos;try&apos;</comment>
<translation>и catch</translation>
@@ -40508,10 +40918,6 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
<context>
<name>TextEditor::Internal::SnippetsSettingsPage</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Group: </source>
<translation>Группа:</translation>
</message>
@@ -40581,10 +40987,6 @@ In addition, Shift+Enter inserts an escape character at the cursor position and
<context>
<name>TextEditor::Internal::TabSettingsWidget</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Tabs And Indentation</source>
<translation>Табуляция и отступы</translation>
</message>
@@ -41256,9 +41658,9 @@ Influences the indentation of continuation lines.
<translation>Текст</translation>
</message>
<message>
- <source>Generic text.
-Applied to text, if no other rules matching.</source>
- <translation>Обычный текст.
+ <source>Generic text and punctuation tokens.
+Applied to text that matched no other rule.</source>
+ <translation>Обычный текст и знаки пунктуации.
Применяется к тексту, когда другие правила не подошли.</translation>
</message>
<message>
@@ -41548,8 +41950,10 @@ Applied to text, if no other rules matching.</source>
<translation>Оператор</translation>
</message>
<message>
- <source>Operators (for example operator++ or operator-=).</source>
- <translation>Операторы (например: operator++ или operator-=).</translation>
+ <source>Non user-defined language operators.
+To style user-defined operators, use Overloaded Operator.</source>
+ <translation>Непользовательские операторы языка.
+Оформление пользовательских операторов находится в разделе Перегруженные операторы.</translation>
</message>
<message>
<source>Preprocessor</source>
@@ -41730,6 +42134,14 @@ Will not be applied to whitespace in comments and strings.</source>
<translation>Цвет подчёркивания контекстов предупреждений.</translation>
</message>
<message>
+ <source>Overloaded Operators</source>
+ <translation>Перегруженные операторы</translation>
+ </message>
+ <message>
+ <source>Calls and declarations of overloaded (user-defined) operators.</source>
+ <translation>Вызовы и объявления перегруженных (пользовательских) операторов.</translation>
+ </message>
+ <message>
<source>Function Declaration</source>
<translation>Объявление функции</translation>
</message>
@@ -41936,6 +42348,23 @@ Will not be applied to whitespace in comments and strings.</source>
</message>
</context>
<context>
+ <name>Timeline::TimelineTraceManager</name>
+ <message>
+ <source>Could not open %1 for writing.</source>
+ <translation>Не удалось открыть %1 для записи.</translation>
+ </message>
+ <message>
+ <source>Could not open %1 for reading.</source>
+ <translation>Не удалось открыть %1 для чтения.</translation>
+ </message>
+ <message>
+ <source>Could not re-read events from temporary trace file: %1
+The trace data is lost.</source>
+ <translation>Не удалось перечитать события из временного файла трассировки: %1.
+Данные трассировки утеряны.</translation>
+ </message>
+</context>
+<context>
<name>Todo::Internal::KeywordDialog</name>
<message>
<source>Keyword</source>
@@ -41965,10 +42394,6 @@ Will not be applied to whitespace in comments and strings.</source>
<context>
<name>Todo::Internal::OptionsDialog</name>
<message>
- <source>Form</source>
- <translation></translation>
- </message>
- <message>
<source>Keywords</source>
<translation>Ключевые слова</translation>
</message>
@@ -42320,6 +42745,10 @@ Will not be applied to whitespace in comments and strings.</source>
<translation>&amp;Обзоры</translation>
</message>
<message>
+ <source>Leave Debug Mode</source>
+ <translation>Выход из режима отладки</translation>
+ </message>
+ <message>
<source>Toolbar</source>
<translation>Панель инструментов</translation>
</message>
@@ -42393,12 +42822,14 @@ Will not be applied to whitespace in comments and strings.</source>
<context>
<name>Utils::EnvironmentDialog</name>
<message>
- <source>Enter one variable per line with the variable name separated from the variable value by &quot;=&quot;.&lt;br&gt;Environment variables can be referenced with ${OTHER}.</source>
- <translation>Введите переменные по одной в строке. Имя переменной должно отделяться от значения символом «=».&lt;br&gt;Ссылаться на переменные среды можно с помощью ${OTHER}.</translation>
- </message>
- <message>
- <source>Change environment by assigning one environment variable per line:</source>
- <translation>Изменение среды путём задания переменных. Одна переменная на строке:</translation>
+ <source>Enter one environment variable per line.
+To set or change a variable, use VARIABLE=VALUE.
+Existing variables can be referenced in a VALUE with ${OTHER}.
+To clear a variable, put its name on a line with nothing else on it.</source>
+ <translation>Вводите по одной переменной среды на строку.
+Для задания или изменения переменной используйте VARIABLE=VALUE.
+В значениях можно обращаться к другим переменным через ${OTHER}.
+Для очистки переменной в строке укажите только её имя и больше ничего.</translation>
</message>
<message>
<source>Edit Environment</source>
@@ -42408,13 +42839,13 @@ Will not be applied to whitespace in comments and strings.</source>
<context>
<name>Utils::EnvironmentIdAccessor</name>
<message>
- <source>&lt;p&gt;No .user settings file created by this instance of %1 was found.&lt;/p&gt;&lt;p&gt;Did you work with this project on another machine or using a different settings path before?&lt;/p&gt;&lt;p&gt;Do you still want to load the settings file &quot;%2&quot;?&lt;/p&gt;</source>
- <translation>&lt;p&gt;Не удалось найти файл настроек от этого %1.&lt;/p&gt;&lt;p&gt;Не работали ли вы ранее с этим проектом на другой машине или не использовали ли вы другой путь к настройкам?&lt;/p&gt;&lt;p&gt;Продолжить загрузку файла настроек «%2»?&lt;/p&gt;</translation>
- </message>
- <message>
<source>Settings File for &quot;%1&quot; from a Different Environment?</source>
<translation>Настройки проекта «%1» с другого компьютера?</translation>
</message>
+ <message>
+ <source>&lt;p&gt;No settings file created by this instance of %1 was found.&lt;/p&gt;&lt;p&gt;Did you work with this project on another machine or using a different settings path before?&lt;/p&gt;&lt;p&gt;Do you still want to load the settings file &quot;%2&quot;?&lt;/p&gt;</source>
+ <translation>&lt;p&gt;Не удалось найти файл настроек от этого экземляра %1.&lt;/p&gt;&lt;p&gt;Возможно вы работали с этим проектом на другой машине или использовали другой путь к настройкам.&lt;/p&gt;&lt;p&gt;Продолжить загрузку файла настроек «%2»?&lt;/p&gt;</translation>
+ </message>
</context>
<context>
<name>Utils::EnvironmentModel</name>
@@ -42815,8 +43246,8 @@ Will not be applied to whitespace in comments and strings.</source>
<context>
<name>Utils::ProjectIntroPage</name>
<message>
- <source>&lt;Enter_Name&gt;</source>
- <translation>&lt;Введите_Имя&gt;</translation>
+ <source>Enter project name</source>
+ <translation>Введите название проекта</translation>
</message>
<message>
<source>Location</source>
@@ -42943,6 +43374,10 @@ Will not be applied to whitespace in comments and strings.</source>
<translation>Подходящие настройки не найдены</translation>
</message>
<message>
+ <source>&lt;p&gt;No valid settings file could be found.&lt;/p&gt;&lt;p&gt;All settings files found in directory &quot;%1&quot; were unsuitable for the current version of %2.&lt;/p&gt;</source>
+ <translation>&lt;p&gt;Не удалось найти корректный файл настроек.&lt;/p&gt;&lt;p&gt;Все найденные в каталоге «%1» файлы настроек не подходят для текущей версии %2.&lt;/p&gt;</translation>
+ </message>
+ <message>
<source>&lt;p&gt;No valid settings file could be found.&lt;/p&gt;&lt;p&gt;All settings files found in directory &quot;%1&quot; were either too new or too old to be read.&lt;/p&gt;</source>
<translation>&lt;p&gt;Не удалось найти подходящий для этой версии Qt Creator файл настроек.&lt;/p&gt;&lt;p&gt;Все найденные в каталоге «%1» файлы настроек или слишком старые, или слишком новые.&lt;/p&gt;</translation>
</message>
@@ -42955,12 +43390,12 @@ Will not be applied to whitespace in comments and strings.</source>
<translation>&lt;p&gt;Будет использоваться резервная копия файла настроек .user более старой версии («%1»), так как текущий файл создан несовместимой версией %2.&lt;/p&gt;&lt;p&gt;Изменения настроек проекта, сделанные с момента последнего запуска этой версии %2, не будут учтены, а изменения, вносимые сейчас, &lt;b&gt;не будут&lt;/b&gt; сохранены в новую версию файла проекта.&lt;/p&gt;</translation>
</message>
<message>
- <source>Unsupported Shared Settings File</source>
- <translation>Неподдерживаемый файл общих настроек</translation>
+ <source>Unsupported Merge Settings File</source>
+ <translation>Неподдерживаемый файл настроек объединения</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>Версия вашего файла .shared не поддерживается этой версией %1. Попробовать загрузить файл?</translation>
+ <source>&quot;%1&quot; is not supported by %1. Do you want to try loading it anyway?</source>
+ <translation>«%1» не поддерживается %2. Продолжить загрузку?</translation>
</message>
</context>
<context>
@@ -43530,6 +43965,10 @@ Will not be applied to whitespace in comments and strings.</source>
<translation>Приостановить запись событий. События не будут записываться, что повысит скорость выполнения программы при профилировании.</translation>
</message>
<message>
+ <source>Discard Data</source>
+ <translation>Отбросить данные</translation>
+ </message>
+ <message>
<source>Go back one step in history. This will select the previously selected item.</source>
<translation>Перейти на шаг назад по истории. Выберет предыдущий выбранный элемент.</translation>
</message>
@@ -43658,184 +44097,6 @@ Will not be applied to whitespace in comments and strings.</source>
</message>
</context>
<context>
- <name>Valgrind::Internal::HeobData</name>
- <message>
- <source>Process %1</source>
- <translation>Процесс %1</translation>
- </message>
- <message>
- <source>Process finished with exit code %1 (0x%2).</source>
- <translation>Процесс завершился с кодом %1 (0x%2).</translation>
- </message>
- <message>
- <source>Unknown argument: -%1</source>
- <translation>Неизвестный параметр: -%1</translation>
- </message>
- <message>
- <source>Cannot create target process.</source>
- <translation>Не удалось создать целевой процесс.</translation>
- </message>
- <message>
- <source>Wrong bitness.</source>
- <translation>Неверная разрядность.</translation>
- </message>
- <message>
- <source>Process killed.</source>
- <translation>Процесс уничтожен.</translation>
- </message>
- <message>
- <source>Only works with dynamically linked CRT.</source>
- <translation>Работает только с динамически подключаемой CRT.</translation>
- </message>
- <message>
- <source>Process stopped with unhandled exception code 0x%1.</source>
- <translation>Процесс остановлен из-за необработанного исключения с кодом 0x%1.</translation>
- </message>
- <message>
- <source>Not enough memory to keep track of allocations.</source>
- <translation>Недостаточно памяти для сохранения истории выделений.</translation>
- </message>
- <message>
- <source>Application stopped unexpectedly.</source>
- <translation>Приложение неожиданно остановилось.</translation>
- </message>
- <message>
- <source>Extra console.</source>
- <translation>Допольнительная консоль.</translation>
- </message>
- <message>
- <source>Unknown exit reason.</source>
- <translation>Неизвестная причина завершения.</translation>
- </message>
- <message>
- <source>Heob stopped unexpectedly.</source>
- <translation>Heob неожиданно остановился.</translation>
- </message>
- <message>
- <source>Heob: %1</source>
- <translation>Heob: %1</translation>
- </message>
- <message>
- <source>Heob: Failure in process attach handshake (%1).</source>
- <translation>Heob: не удалось выполнить рукопожание при подключении к процессу (%1).</translation>
- </message>
-</context>
-<context>
- <name>Valgrind::Internal::HeobDialog</name>
- <message>
- <source>XML output file:</source>
- <translation>Выходной файл XML:</translation>
- </message>
- <message>
- <source>Handle exceptions:</source>
- <translation>Обрабатывать исключения:</translation>
- </message>
- <message>
- <source>Off</source>
- <translation>Откл.</translation>
- </message>
- <message>
- <source>On</source>
- <translation>Вкл.</translation>
- </message>
- <message>
- <source>Only</source>
- <translation>Только</translation>
- </message>
- <message>
- <source>Page protection:</source>
- <translation>Защита страниц:</translation>
- </message>
- <message>
- <source>After</source>
- <translation>Перед</translation>
- </message>
- <message>
- <source>Before</source>
- <translation>После</translation>
- </message>
- <message>
- <source>Freed memory protection</source>
- <translation>Защита освобождённой памяти</translation>
- </message>
- <message>
- <source>Raise breakpoint exception on error</source>
- <translation>Кидать исключение (точка останова) при ошибке</translation>
- </message>
- <message>
- <source>Leak details:</source>
- <translation>Подробности об утечке:</translation>
- </message>
- <message>
- <source>None</source>
- <translation>Нет</translation>
- </message>
- <message>
- <source>Simple</source>
- <translation>Простые</translation>
- </message>
- <message>
- <source>Detect Leak Types</source>
- <translation>Определять типы утечек</translation>
- </message>
- <message>
- <source>Detect Leak Types (Show Reachable)</source>
- <translation>Определять типы утечек (показывать доступные)</translation>
- </message>
- <message>
- <source>Fuzzy Detect Leak Types</source>
- <translation>Нечётко определять типы утечек</translation>
- </message>
- <message>
- <source>Fuzzy Detect Leak Types (Show Reachable)</source>
- <translation>Нечётко определять типы утечек (показывать доступные)</translation>
- </message>
- <message>
- <source>Minimum leak size:</source>
- <translation>Минимальный размер утечки:</translation>
- </message>
- <message>
- <source>Control leak recording:</source>
- <translation>Управление записью утечек:</translation>
- </message>
- <message>
- <source>On (Start Disabled)</source>
- <translation>Вкл. (отключён старт)</translation>
- </message>
- <message>
- <source>On (Start Enabled)</source>
- <translation>Вкл. (включён старт)</translation>
- </message>
- <message>
- <source>Run with debugger</source>
- <translation>Запускать с отладчиком</translation>
- </message>
- <message>
- <source>Extra arguments:</source>
- <translation>Доп. параметры:</translation>
- </message>
- <message>
- <source>Heob path:</source>
- <translation>Путь к Heob:</translation>
- </message>
- <message>
- <source>The location of heob32.exe and heob64.exe.</source>
- <translation>Размещение heob32.exe и heob64.exe.</translation>
- </message>
- <message>
- <source>Save current settings as default.</source>
- <translation>Сохранить текущие настройки как настройки по умолчанию.</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>
@@ -43896,8 +44157,7 @@ When a problem is detected, the application is interrupted and can be debugged.<
</message>
<message>
<source>Heob</source>
- <translatorcomment>Х.з. что такое</translatorcomment>
- <translation type="unfinished">Heob</translation>
+ <translation>Heob</translation>
</message>
<message>
<source>Ctrl+Alt+H</source>
@@ -45096,27 +45356,17 @@ should a repository require SSH-authentication (see documentation on SSH and the
<context>
<name>WinRt::Internal::WinRtRunConfiguration</name>
<message>
- <source>Run App Package</source>
- <translation>Запуск пакета приложения</translation>
+ <source>Uninstall package after application stops</source>
+ <translation>Удалить пакет после завершения приложения</translation>
</message>
-</context>
-<context>
- <name>WinRt::Internal::WinRtRunConfigurationFactory</name>
<message>
<source>Run App Package</source>
<translation>Запуск пакета приложения</translation>
</message>
-</context>
-<context>
- <name>WinRt::Internal::WinRtRunConfigurationWidget</name>
<message>
<source>Launch App</source>
<translation>Запуск приложения</translation>
</message>
- <message>
- <source>Uninstall package after application stops</source>
- <translation>Удалить пакет после завершения приложения</translation>
- </message>
</context>
<context>
<name>WinRt::Internal::WinRtRunnerHelper</name>
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 805700f942..e4ff7047eb 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -70,7 +70,7 @@ public:
_message = Message(type, _location);
}
- virtual void visit(const NumberValue *value)
+ void visit(const NumberValue *value) override
{
if (const QmlEnumValue *enumValue = value_cast<QmlEnumValue>(value)) {
if (StringLiteral *stringLiteral = cast<StringLiteral *>(_ast)) {
@@ -90,7 +90,7 @@ public:
}
}
- virtual void visit(const BooleanValue *)
+ void visit(const BooleanValue *) override
{
UnaryMinusExpression *unaryMinus = cast<UnaryMinusExpression *>(_ast);
@@ -101,7 +101,7 @@ public:
}
}
- virtual void visit(const StringValue *value)
+ void visit(const StringValue *value) override
{
UnaryMinusExpression *unaryMinus = cast<UnaryMinusExpression *>(_ast);
@@ -132,7 +132,7 @@ public:
}
}
- virtual void visit(const ColorValue *)
+ void visit(const ColorValue *) override
{
if (StringLiteral *stringLiteral = cast<StringLiteral *>(_ast)) {
if (!toQColor(stringLiteral->value.toString()).isValid())
@@ -142,7 +142,7 @@ public:
}
}
- virtual void visit(const AnchorLineValue *)
+ void visit(const AnchorLineValue *) override
{
if (! (_rhsValue->asAnchorLineValue() || _rhsValue->asUnknownValue()))
setMessage(ErrAnchorLineExpected);
@@ -189,7 +189,7 @@ protected:
return _state;
}
- virtual bool preVisit(Node *ast)
+ bool preVisit(Node *ast) override
{
if (ast->expressionCast())
return false;
@@ -204,7 +204,7 @@ protected:
return false;
}
- virtual bool visit(LabelledStatement *ast)
+ bool visit(LabelledStatement *ast) override
{
// get the target statement
Statement *end = ast->statement;
@@ -219,7 +219,7 @@ protected:
return true;
}
- virtual bool visit(BreakStatement *ast)
+ bool visit(BreakStatement *ast) override
{
_state = Break;
if (!ast->label.isEmpty()) {
@@ -232,12 +232,12 @@ protected:
}
// labelled continues don't change control flow...
- virtual bool visit(ContinueStatement *) { _state = Continue; return false; }
+ bool visit(ContinueStatement *) override { _state = Continue; return false; }
- virtual bool visit(ReturnStatement *) { _state = ReturnOrThrow; return false; }
- virtual bool visit(ThrowStatement *) { _state = ReturnOrThrow; return false; }
+ bool visit(ReturnStatement *) override { _state = ReturnOrThrow; return false; }
+ bool visit(ThrowStatement *) override { _state = ReturnOrThrow; return false; }
- virtual bool visit(IfStatement *ast)
+ bool visit(IfStatement *ast) override
{
State ok = check(ast->ok);
State ko = check(ast->ko);
@@ -256,7 +256,7 @@ protected:
}
}
- virtual bool visit(SwitchStatement *ast)
+ bool visit(SwitchStatement *ast) override
{
if (!ast->block)
return false;
@@ -282,7 +282,7 @@ protected:
return false;
}
- virtual bool visit(TryStatement *ast)
+ bool visit(TryStatement *ast) override
{
State tryBody = check(ast->statement);
State catchBody = ReturnOrThrow;
@@ -303,13 +303,13 @@ protected:
return false;
}
- virtual bool visit(WhileStatement *ast) { return preconditionLoopStatement(ast, ast->statement); }
- virtual bool visit(ForStatement *ast) { return preconditionLoopStatement(ast, ast->statement); }
- virtual bool visit(ForEachStatement *ast) { return preconditionLoopStatement(ast, ast->statement); }
- virtual bool visit(LocalForStatement *ast) { return preconditionLoopStatement(ast, ast->statement); }
- virtual bool visit(LocalForEachStatement *ast) { return preconditionLoopStatement(ast, ast->statement); }
+ bool visit(WhileStatement *ast) override { return preconditionLoopStatement(ast, ast->statement); }
+ bool visit(ForStatement *ast) override { return preconditionLoopStatement(ast, ast->statement); }
+ bool visit(ForEachStatement *ast) override { return preconditionLoopStatement(ast, ast->statement); }
+ bool visit(LocalForStatement *ast) override { return preconditionLoopStatement(ast, ast->statement); }
+ bool visit(LocalForEachStatement *ast) override { return preconditionLoopStatement(ast, ast->statement); }
- virtual bool visit(DoWhileStatement *ast)
+ bool visit(DoWhileStatement *ast) override
{
check(ast->statement);
// not necessarily an infinite loop due to labelled breaks
@@ -335,7 +335,7 @@ public:
}
protected:
- virtual State check(Node *node)
+ State check(Node *node) override
{
bool oldwarning = _emittedWarning;
_emittedWarning = false;
@@ -344,7 +344,7 @@ protected:
return s;
}
- virtual void onUnreachable(Node *node)
+ void onUnreachable(Node *node) override
{
if (_emittedWarning)
return;
diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp
index 84ada6a0d6..6bf17505d6 100644
--- a/src/libs/qmljs/qmljsfindexportedcpptypes.cpp
+++ b/src/libs/qmljs/qmljsfindexportedcpptypes.cpp
@@ -119,7 +119,7 @@ public:
}
protected:
- virtual bool visit(CompoundStatementAST *ast)
+ bool visit(CompoundStatementAST *ast) override
{
CompoundStatementAST *old = _compound;
_compound = ast;
@@ -128,7 +128,7 @@ protected:
return false;
}
- virtual bool visit(CallAST *ast)
+ bool visit(CallAST *ast) override
{
if (checkForQmlRegisterType(ast))
return false;
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index eaf27d433e..d8df6ed570 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -103,27 +103,27 @@ public:
const Value *value() const { return m_value; }
- virtual bool processProperty(const QString &name, const Value *value, const PropertyInfo &)
+ bool processProperty(const QString &name, const Value *value, const PropertyInfo &) override
{
return process(name, value);
}
- virtual bool processEnumerator(const QString &name, const Value *value)
+ bool processEnumerator(const QString &name, const Value *value) override
{
return process(name, value);
}
- virtual bool processSignal(const QString &name, const Value *value)
+ bool processSignal(const QString &name, const Value *value) override
{
return process(name, value);
}
- virtual bool processSlot(const QString &name, const Value *value)
+ bool processSlot(const QString &name, const Value *value) override
{
return process(name, value);
}
- virtual bool processGeneratedSlot(const QString &name, const Value *value)
+ bool processGeneratedSlot(const QString &name, const Value *value) override
{
return process(name, value);
}
@@ -2574,31 +2574,31 @@ class MemberDumper: public MemberProcessor
public:
MemberDumper() {}
- virtual bool processProperty(const QString &name, const Value *, const PropertyInfo &pInfo)
+ bool processProperty(const QString &name, const Value *, const PropertyInfo &pInfo) override
{
qCDebug(qmljsLog) << "property: " << name << " flags:" << pInfo.toString();
return true;
}
- virtual bool processEnumerator(const QString &name, const Value *)
+ bool processEnumerator(const QString &name, const Value *) override
{
qCDebug(qmljsLog) << "enumerator: " << name;
return true;
}
- virtual bool processSignal(const QString &name, const Value *)
+ bool processSignal(const QString &name, const Value *) override
{
qCDebug(qmljsLog) << "signal: " << name;
return true;
}
- virtual bool processSlot(const QString &name, const Value *)
+ bool processSlot(const QString &name, const Value *) override
{
qCDebug(qmljsLog) << "slot: " << name;
return true;
}
- virtual bool processGeneratedSlot(const QString &name, const Value *)
+ bool processGeneratedSlot(const QString &name, const Value *) override
{
qCDebug(qmljsLog) << "generated slot: " << name;
return true;
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index e0ca6775e8..91d4db897e 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -53,12 +53,12 @@ protected:
BlockData data;
};
- virtual void saveBlockData(QTextBlock *block, const BlockData &data) const
+ void saveBlockData(QTextBlock *block, const BlockData &data) const override
{
block->setUserData(new FormatterData(data));
}
- virtual bool loadBlockData(const QTextBlock &block, BlockData *data) const
+ bool loadBlockData(const QTextBlock &block, BlockData *data) const override
{
if (!block.userData())
return false;
@@ -67,12 +67,12 @@ protected:
return true;
}
- virtual void saveLexerState(QTextBlock *block, int state) const
+ void saveLexerState(QTextBlock *block, int state) const override
{
block->setUserState(state);
}
- virtual int loadLexerState(const QTextBlock &block) const
+ int loadLexerState(const QTextBlock &block) const override
{
return block.userState();
}
@@ -464,7 +464,7 @@ protected:
loc.length += 2;
}
- virtual bool preVisit(Node *ast)
+ bool preVisit(Node *ast) override
{
SourceLocation firstLoc;
if (ExpressionNode *expr = ast->expressionCast())
@@ -486,7 +486,7 @@ protected:
return true;
}
- virtual void postVisit(Node *ast)
+ void postVisit(Node *ast) override
{
SourceLocation lastLoc;
if (ExpressionNode *expr = ast->expressionCast())
@@ -525,14 +525,14 @@ protected:
}
}
- virtual bool visit(UiPragma *ast)
+ bool visit(UiPragma *ast) override
{
out("pragma ", ast->pragmaToken);
accept(ast->pragmaType);
return false;
}
- virtual bool visit(UiImport *ast)
+ bool visit(UiImport *ast) override
{
out("import ", ast->importToken);
if (!ast->fileName.isNull())
@@ -550,7 +550,7 @@ protected:
return false;
}
- virtual bool visit(UiObjectDefinition *ast)
+ bool visit(UiObjectDefinition *ast) override
{
accept(ast->qualifiedTypeNameId);
out(" ");
@@ -558,7 +558,7 @@ protected:
return false;
}
- virtual bool visit(UiObjectInitializer *ast)
+ bool visit(UiObjectInitializer *ast) override
{
out(ast->lbraceToken);
if (ast->members)
@@ -568,7 +568,7 @@ protected:
return false;
}
- virtual bool visit(UiParameterList *list)
+ bool visit(UiParameterList *list) override
{
for (UiParameterList *it = list; it; it = it->next) {
out(it->propertyTypeToken);
@@ -580,7 +580,7 @@ protected:
return false;
}
- virtual bool visit(UiPublicMember *ast)
+ bool visit(UiPublicMember *ast) override
{
if (ast->type == UiPublicMember::Property) {
if (ast->isDefaultMember)
@@ -618,7 +618,7 @@ protected:
return false;
}
- virtual bool visit(UiObjectBinding *ast)
+ bool visit(UiObjectBinding *ast) override
{
if (ast->hasOnToken) {
accept(ast->qualifiedTypeNameId);
@@ -634,7 +634,7 @@ protected:
return false;
}
- virtual bool visit(UiScriptBinding *ast)
+ bool visit(UiScriptBinding *ast) override
{
accept(ast->qualifiedId);
out(": ", ast->colonToken);
@@ -642,7 +642,7 @@ protected:
return false;
}
- virtual bool visit(UiArrayBinding *ast)
+ bool visit(UiArrayBinding *ast) override
{
accept(ast->qualifiedId);
out(ast->colonToken);
@@ -654,16 +654,16 @@ protected:
return false;
}
- virtual bool visit(ThisExpression *ast) { out(ast->thisToken); return true; }
- virtual bool visit(NullExpression *ast) { out(ast->nullToken); return true; }
- virtual bool visit(TrueLiteral *ast) { out(ast->trueToken); return true; }
- virtual bool visit(FalseLiteral *ast) { out(ast->falseToken); return true; }
- virtual bool visit(IdentifierExpression *ast) { out(ast->identifierToken); return true; }
- virtual bool visit(StringLiteral *ast) { out(ast->literalToken); return true; }
- virtual bool visit(NumericLiteral *ast) { out(ast->literalToken); return true; }
- virtual bool visit(RegExpLiteral *ast) { out(ast->literalToken); return true; }
+ bool visit(ThisExpression *ast) override { out(ast->thisToken); return true; }
+ bool visit(NullExpression *ast) override { out(ast->nullToken); return true; }
+ bool visit(TrueLiteral *ast) override { out(ast->trueToken); return true; }
+ bool visit(FalseLiteral *ast) override { out(ast->falseToken); return true; }
+ bool visit(IdentifierExpression *ast) override { out(ast->identifierToken); return true; }
+ bool visit(StringLiteral *ast) override { out(ast->literalToken); return true; }
+ bool visit(NumericLiteral *ast) override { out(ast->literalToken); return true; }
+ bool visit(RegExpLiteral *ast) override { out(ast->literalToken); return true; }
- virtual bool visit(ArrayLiteral *ast)
+ bool visit(ArrayLiteral *ast) override
{
out(ast->lbracketToken);
if (ast->elements)
@@ -676,7 +676,7 @@ protected:
return false;
}
- virtual bool visit(ObjectLiteral *ast)
+ bool visit(ObjectLiteral *ast) override
{
out(ast->lbraceToken);
lnAcceptIndented(ast->properties);
@@ -685,7 +685,7 @@ protected:
return false;
}
- virtual bool visit(ElementList *ast)
+ bool visit(ElementList *ast) override
{
for (ElementList *it = ast; it; it = it->next) {
if (it->elision)
@@ -700,7 +700,7 @@ protected:
return false;
}
- virtual bool visit(PropertyAssignmentList *ast)
+ bool visit(PropertyAssignmentList *ast) override
{
for (PropertyAssignmentList *it = ast; it; it = it->next) {
PropertyNameAndValue *assignment = AST::cast<PropertyNameAndValue *>(it->assignment);
@@ -739,7 +739,7 @@ protected:
return false;
}
- virtual bool visit(NestedExpression *ast)
+ bool visit(NestedExpression *ast) override
{
out(ast->lparenToken);
accept(ast->expression);
@@ -747,11 +747,11 @@ protected:
return false;
}
- virtual bool visit(IdentifierPropertyName *ast) { out(ast->id.toString()); return true; }
- virtual bool visit(StringLiteralPropertyName *ast) { out(ast->id.toString()); return true; }
- virtual bool visit(NumericLiteralPropertyName *ast) { out(QString::number(ast->id)); return true; }
+ bool visit(IdentifierPropertyName *ast) override { out(ast->id.toString()); return true; }
+ bool visit(StringLiteralPropertyName *ast) override { out(ast->id.toString()); return true; }
+ bool visit(NumericLiteralPropertyName *ast) override { out(QString::number(ast->id)); return true; }
- virtual bool visit(ArrayMemberExpression *ast)
+ bool visit(ArrayMemberExpression *ast) override
{
accept(ast->base);
out(ast->lbracketToken);
@@ -760,7 +760,7 @@ protected:
return false;
}
- virtual bool visit(FieldMemberExpression *ast)
+ bool visit(FieldMemberExpression *ast) override
{
accept(ast->base);
out(ast->dotToken);
@@ -768,7 +768,7 @@ protected:
return false;
}
- virtual bool visit(NewMemberExpression *ast)
+ bool visit(NewMemberExpression *ast) override
{
out("new ", ast->newToken);
accept(ast->base);
@@ -778,14 +778,14 @@ protected:
return false;
}
- virtual bool visit(NewExpression *ast)
+ bool visit(NewExpression *ast) override
{
out("new ", ast->newToken);
accept(ast->expression);
return false;
}
- virtual bool visit(CallExpression *ast)
+ bool visit(CallExpression *ast) override
{
accept(ast->base);
out(ast->lparenToken);
@@ -795,84 +795,84 @@ protected:
return false;
}
- virtual bool visit(PostIncrementExpression *ast)
+ bool visit(PostIncrementExpression *ast) override
{
accept(ast->base);
out(ast->incrementToken);
return false;
}
- virtual bool visit(PostDecrementExpression *ast)
+ bool visit(PostDecrementExpression *ast) override
{
accept(ast->base);
out(ast->decrementToken);
return false;
}
- virtual bool visit(PreIncrementExpression *ast)
+ bool visit(PreIncrementExpression *ast) override
{
out(ast->incrementToken);
accept(ast->expression);
return false;
}
- virtual bool visit(PreDecrementExpression *ast)
+ bool visit(PreDecrementExpression *ast) override
{
out(ast->decrementToken);
accept(ast->expression);
return false;
}
- virtual bool visit(DeleteExpression *ast)
+ bool visit(DeleteExpression *ast) override
{
out("delete ", ast->deleteToken);
accept(ast->expression);
return false;
}
- virtual bool visit(VoidExpression *ast)
+ bool visit(VoidExpression *ast) override
{
out("void ", ast->voidToken);
accept(ast->expression);
return false;
}
- virtual bool visit(TypeOfExpression *ast)
+ bool visit(TypeOfExpression *ast) override
{
out("typeof ", ast->typeofToken);
accept(ast->expression);
return false;
}
- virtual bool visit(UnaryPlusExpression *ast)
+ bool visit(UnaryPlusExpression *ast) override
{
out(ast->plusToken);
accept(ast->expression);
return false;
}
- virtual bool visit(UnaryMinusExpression *ast)
+ bool visit(UnaryMinusExpression *ast) override
{
out(ast->minusToken);
accept(ast->expression);
return false;
}
- virtual bool visit(TildeExpression *ast)
+ bool visit(TildeExpression *ast) override
{
out(ast->tildeToken);
accept(ast->expression);
return false;
}
- virtual bool visit(NotExpression *ast)
+ bool visit(NotExpression *ast) override
{
out(ast->notToken);
accept(ast->expression);
return false;
}
- virtual bool visit(BinaryExpression *ast)
+ bool visit(BinaryExpression *ast) override
{
++_binaryExpDepth;
accept(ast->left);
@@ -893,7 +893,7 @@ protected:
return false;
}
- virtual bool visit(ConditionalExpression *ast)
+ bool visit(ConditionalExpression *ast) override
{
accept(ast->expression);
out(" ? ", ast->questionToken);
@@ -903,7 +903,7 @@ protected:
return false;
}
- virtual bool visit(Block *ast)
+ bool visit(Block *ast) override
{
out(ast->lbraceToken);
lnAcceptIndented(ast->statements);
@@ -912,14 +912,14 @@ protected:
return false;
}
- virtual bool visit(VariableStatement *ast)
+ bool visit(VariableStatement *ast) override
{
out("var ", ast->declarationKindToken);
accept(ast->declarations);
return false;
}
- virtual bool visit(VariableDeclaration *ast)
+ bool visit(VariableDeclaration *ast) override
{
out(ast->identifierToken);
if (ast->expression) {
@@ -929,13 +929,13 @@ protected:
return false;
}
- virtual bool visit(EmptyStatement *ast)
+ bool visit(EmptyStatement *ast) override
{
out(ast->semicolonToken);
return false;
}
- virtual bool visit(IfStatement *ast)
+ bool visit(IfStatement *ast) override
{
out(ast->ifToken);
out(" ");
@@ -955,7 +955,7 @@ protected:
return false;
}
- virtual bool visit(DoWhileStatement *ast)
+ bool visit(DoWhileStatement *ast) override
{
out(ast->doToken);
acceptBlockOrIndented(ast->statement, true);
@@ -967,7 +967,7 @@ protected:
return false;
}
- virtual bool visit(WhileStatement *ast)
+ bool visit(WhileStatement *ast) override
{
out(ast->whileToken);
out(" ");
@@ -978,7 +978,7 @@ protected:
return false;
}
- virtual bool visit(ForStatement *ast)
+ bool visit(ForStatement *ast) override
{
out(ast->forToken);
out(" ");
@@ -993,7 +993,7 @@ protected:
return false;
}
- virtual bool visit(LocalForStatement *ast)
+ bool visit(LocalForStatement *ast) override
{
out(ast->forToken);
out(" ");
@@ -1010,7 +1010,7 @@ protected:
return false;
}
- virtual bool visit(ForEachStatement *ast)
+ bool visit(ForEachStatement *ast) override
{
out(ast->forToken);
out(" ");
@@ -1023,7 +1023,7 @@ protected:
return false;
}
- virtual bool visit(LocalForEachStatement *ast)
+ bool visit(LocalForEachStatement *ast) override
{
out(ast->forToken);
out(" ");
@@ -1038,7 +1038,7 @@ protected:
return false;
}
- virtual bool visit(ContinueStatement *ast)
+ bool visit(ContinueStatement *ast) override
{
out(ast->continueToken);
if (!ast->label.isNull()) {
@@ -1048,7 +1048,7 @@ protected:
return false;
}
- virtual bool visit(BreakStatement *ast)
+ bool visit(BreakStatement *ast) override
{
out(ast->breakToken);
if (!ast->label.isNull()) {
@@ -1058,7 +1058,7 @@ protected:
return false;
}
- virtual bool visit(ReturnStatement *ast)
+ bool visit(ReturnStatement *ast) override
{
out(ast->returnToken);
if (ast->expression) {
@@ -1068,7 +1068,7 @@ protected:
return false;
}
- virtual bool visit(ThrowStatement *ast)
+ bool visit(ThrowStatement *ast) override
{
out(ast->throwToken);
if (ast->expression) {
@@ -1078,7 +1078,7 @@ protected:
return false;
}
- virtual bool visit(WithStatement *ast)
+ bool visit(WithStatement *ast) override
{
out(ast->withToken);
out(" ");
@@ -1089,7 +1089,7 @@ protected:
return false;
}
- virtual bool visit(SwitchStatement *ast)
+ bool visit(SwitchStatement *ast) override
{
out(ast->switchToken);
out(" ");
@@ -1101,7 +1101,7 @@ protected:
return false;
}
- virtual bool visit(CaseBlock *ast)
+ bool visit(CaseBlock *ast) override
{
out(ast->lbraceToken);
newLine();
@@ -1117,7 +1117,7 @@ protected:
return false;
}
- virtual bool visit(CaseClause *ast)
+ bool visit(CaseClause *ast) override
{
out("case ", ast->caseToken);
accept(ast->expression);
@@ -1127,7 +1127,7 @@ protected:
return false;
}
- virtual bool visit(DefaultClause *ast)
+ bool visit(DefaultClause *ast) override
{
out(ast->defaultToken);
out(ast->colonToken);
@@ -1135,7 +1135,7 @@ protected:
return false;
}
- virtual bool visit(LabelledStatement *ast)
+ bool visit(LabelledStatement *ast) override
{
out(ast->identifierToken);
out(": ", ast->colonToken);
@@ -1143,7 +1143,7 @@ protected:
return false;
}
- virtual bool visit(TryStatement *ast)
+ bool visit(TryStatement *ast) override
{
out("try ", ast->tryToken);
accept(ast->statement);
@@ -1158,7 +1158,7 @@ protected:
return false;
}
- virtual bool visit(Catch *ast)
+ bool visit(Catch *ast) override
{
out(ast->catchToken);
out(" ");
@@ -1169,19 +1169,19 @@ protected:
return false;
}
- virtual bool visit(Finally *ast)
+ bool visit(Finally *ast) override
{
out("finally ", ast->finallyToken);
accept(ast->statement);
return false;
}
- virtual bool visit(FunctionDeclaration *ast)
+ bool visit(FunctionDeclaration *ast) override
{
return visit(static_cast<FunctionExpression *>(ast));
}
- virtual bool visit(FunctionExpression *ast)
+ bool visit(FunctionExpression *ast) override
{
out("function ", ast->functionToken);
if (!ast->name.isNull())
@@ -1200,7 +1200,7 @@ protected:
}
- virtual bool visit(UiHeaderItemList *ast)
+ bool visit(UiHeaderItemList *ast) override
{
for (UiHeaderItemList *it = ast; it; it = it->next) {
accept(it->headerItem);
@@ -1210,7 +1210,7 @@ protected:
return false;
}
- virtual bool visit(UiObjectMemberList *ast)
+ bool visit(UiObjectMemberList *ast) override
{
for (UiObjectMemberList *it = ast; it; it = it->next) {
accept(it->member);
@@ -1220,7 +1220,7 @@ protected:
return false;
}
- virtual bool visit(UiArrayMemberList *ast)
+ bool visit(UiArrayMemberList *ast) override
{
for (UiArrayMemberList *it = ast; it; it = it->next) {
accept(it->member);
@@ -1232,7 +1232,7 @@ protected:
return false;
}
- virtual bool visit(UiQualifiedId *ast)
+ bool visit(UiQualifiedId *ast) override
{
for (UiQualifiedId *it = ast; it; it = it->next) {
out(it->identifierToken);
@@ -1242,13 +1242,13 @@ protected:
return false;
}
- virtual bool visit(UiQualifiedPragmaId *ast)
+ bool visit(UiQualifiedPragmaId *ast) override
{
out(ast->identifierToken);
return false;
}
- virtual bool visit(Elision *ast)
+ bool visit(Elision *ast) override
{
for (Elision *it = ast; it; it = it->next) {
if (it->next)
@@ -1257,7 +1257,7 @@ protected:
return false;
}
- virtual bool visit(ArgumentList *ast)
+ bool visit(ArgumentList *ast) override
{
for (ArgumentList *it = ast; it; it = it->next) {
accept(it->expression);
@@ -1269,7 +1269,7 @@ protected:
return false;
}
- virtual bool visit(StatementList *ast)
+ bool visit(StatementList *ast) override
{
for (StatementList *it = ast; it; it = it->next) {
// ### work around parser bug: skip empty statements with wrong tokens
@@ -1285,7 +1285,7 @@ protected:
return false;
}
- virtual bool visit(SourceElements *ast)
+ bool visit(SourceElements *ast) override
{
for (SourceElements *it = ast; it; it = it->next) {
accept(it->element);
@@ -1295,7 +1295,7 @@ protected:
return false;
}
- virtual bool visit(VariableDeclarationList *ast)
+ bool visit(VariableDeclarationList *ast) override
{
for (VariableDeclarationList *it = ast; it; it = it->next) {
accept(it->declaration);
@@ -1305,7 +1305,7 @@ protected:
return false;
}
- virtual bool visit(CaseClauses *ast)
+ bool visit(CaseClauses *ast) override
{
for (CaseClauses *it = ast; it; it = it->next) {
accept(it->clause);
@@ -1315,7 +1315,7 @@ protected:
return false;
}
- virtual bool visit(FormalParameterList *ast)
+ bool visit(FormalParameterList *ast) override
{
for (FormalParameterList *it = ast; it; it = it->next) {
if (it->commaToken.isValid())
diff --git a/src/libs/tracing/timelineitemsrenderpass.cpp b/src/libs/tracing/timelineitemsrenderpass.cpp
index 7dd88406e5..a4f89dc64d 100644
--- a/src/libs/tracing/timelineitemsrenderpass.cpp
+++ b/src/libs/tracing/timelineitemsrenderpass.cpp
@@ -342,7 +342,7 @@ void TimelineItemsGeometry::updateCurrentNode(float itemRight, float itemTop)
class TimelineExpandedRowNode : public QSGNode {
public:
TimelineItemsMaterial material;
- virtual ~TimelineExpandedRowNode() {}
+ ~TimelineExpandedRowNode() override {}
};
static qint64 startTime(const TimelineModel *model, const TimelineRenderState *parentState, int i)
@@ -436,12 +436,12 @@ class TimelineItemsMaterialShader : public QSGMaterialShader
public:
TimelineItemsMaterialShader();
- virtual void updateState(const RenderState &state, QSGMaterial *newEffect,
- QSGMaterial *oldEffect);
- virtual char const *const *attributeNames() const;
+ void updateState(const RenderState &state, QSGMaterial *newEffect,
+ QSGMaterial *oldEffect) override;
+ char const *const *attributeNames() const override;
private:
- virtual void initialize();
+ void initialize() override;
int m_matrix_id;
int m_scale_id;
diff --git a/src/libs/tracing/timelinenotesrenderpass.cpp b/src/libs/tracing/timelinenotesrenderpass.cpp
index 932473183d..0aa36a1762 100644
--- a/src/libs/tracing/timelinenotesrenderpass.cpp
+++ b/src/libs/tracing/timelinenotesrenderpass.cpp
@@ -220,12 +220,12 @@ class NotesMaterialShader : public QSGMaterialShader
public:
NotesMaterialShader();
- virtual void updateState(const RenderState &state, QSGMaterial *newEffect,
- QSGMaterial *oldEffect);
- virtual char const *const *attributeNames() const;
+ void updateState(const RenderState &state, QSGMaterial *newEffect,
+ QSGMaterial *oldEffect) override;
+ char const *const *attributeNames() const override;
private:
- virtual void initialize();
+ void initialize() override;
int m_matrix_id;
int m_z_range_id;
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 07de1d799c..93d9830d15 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -85,7 +85,7 @@ class FancyLineEditPrivate : public QObject
public:
explicit FancyLineEditPrivate(FancyLineEdit *parent);
- virtual bool eventFilter(QObject *obj, QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event) override;
FancyLineEdit *m_lineEdit;
IconButton *m_iconbutton[2];
diff --git a/src/libs/utils/images/filtericon.png b/src/libs/utils/images/filtericon.png
index 0ced0c1ebe..1afcb471b0 100644
--- a/src/libs/utils/images/filtericon.png
+++ b/src/libs/utils/images/filtericon.png
Binary files differ
diff --git a/src/libs/utils/images/filtericon@2x.png b/src/libs/utils/images/filtericon@2x.png
index caa4c03081..5f38943399 100644
--- a/src/libs/utils/images/filtericon@2x.png
+++ b/src/libs/utils/images/filtericon@2x.png
Binary files differ
diff --git a/src/libs/utils/images/toolbuttonexpandarrow.png b/src/libs/utils/images/toolbuttonexpandarrow.png
new file mode 100644
index 0000000000..cf0fac9065
--- /dev/null
+++ b/src/libs/utils/images/toolbuttonexpandarrow.png
Binary files differ
diff --git a/src/libs/utils/images/toolbuttonexpandarrow@2x.png b/src/libs/utils/images/toolbuttonexpandarrow@2x.png
new file mode 100644
index 0000000000..8f53c0cd36
--- /dev/null
+++ b/src/libs/utils/images/toolbuttonexpandarrow@2x.png
Binary files differ
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 4bcd45767e..7fde56993e 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -147,7 +147,7 @@ public:
BinaryVersionToolTipEventFilter(pe->lineEdit()), m_pathChooser(pe) {}
private:
- virtual QString defaultToolTip() const
+ QString defaultToolTip() const override
{ return m_pathChooser->errorMessage(); }
const PathChooser *m_pathChooser = nullptr;
diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp
index bdafb43edc..c4691d8585 100644
--- a/src/libs/utils/pathlisteditor.cpp
+++ b/src/libs/utils/pathlisteditor.cpp
@@ -70,7 +70,7 @@ class PathListPlainTextEdit : public QPlainTextEdit {
public:
explicit PathListPlainTextEdit(QWidget *parent = 0);
protected:
- virtual void insertFromMimeData (const QMimeData *source);
+ void insertFromMimeData (const QMimeData *source) override;
};
PathListPlainTextEdit::PathListPlainTextEdit(QWidget *parent) :
diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp
index 667c3922e0..13b9db0d84 100644
--- a/src/libs/utils/savefile.cpp
+++ b/src/libs/utils/savefile.cpp
@@ -126,7 +126,7 @@ bool SaveFile::commit()
m_tempFile.reset();
bool result = ReplaceFile(finalFileName.toStdWString().data(),
fileName().toStdWString().data(),
- nullptr, 0, nullptr, nullptr);
+ nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr);
if (!result) {
const DWORD replaceErrorCode = GetLastError();
QString errorStr;
diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp
index 2c0cdee733..05c515eabf 100644
--- a/src/libs/utils/shellcommand.cpp
+++ b/src/libs/utils/shellcommand.cpp
@@ -276,6 +276,7 @@ void ShellCommand::run(QFutureInterface<void> &future)
QString stdOut;
QString stdErr;
+ emit started();
if (d->m_progressParser)
d->m_progressParser->setFuture(&future);
else
diff --git a/src/libs/utils/shellcommand.h b/src/libs/utils/shellcommand.h
index c8bf38af11..eb3161e3a1 100644
--- a/src/libs/utils/shellcommand.h
+++ b/src/libs/utils/shellcommand.h
@@ -154,6 +154,7 @@ public:
signals:
void stdOutText(const QString &);
void stdErrText(const QString &);
+ void started();
void finished(bool ok, int exitCode, const QVariant &cookie);
void success(const QVariant &cookie);
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index b4b2cfc2b3..732a8e2a30 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -90,7 +90,7 @@ public:
void setFlags(unsigned tc) { m_flags = tc; }
protected:
- virtual void setupChildProcess();
+ void setupChildProcess() override;
private:
unsigned m_flags;
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index c3537648e3..032ca917c0 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -207,5 +207,7 @@
<file>images/lightbulb@2x.png</file>
<file>images/lightbulbcap.png</file>
<file>images/lightbulbcap@2x.png</file>
+ <file>images/toolbuttonexpandarrow.png</file>
+ <file>images/toolbuttonexpandarrow@2x.png</file>
</qresource>
</RCC>
diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp
index 66798a9449..62f8743706 100644
--- a/src/libs/utils/utilsicons.cpp
+++ b/src/libs/utils/utilsicons.cpp
@@ -176,7 +176,8 @@ const Icon CLOSE_SPLIT_LEFT({
const Icon CLOSE_SPLIT_RIGHT({
{QLatin1String(":/utils/images/splitbutton_closeright.png"), Theme::IconsBaseColor}});
const Icon FILTER({
- {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor}});
+ {QLatin1String(":/utils/images/filtericon.png"), Theme::IconsBaseColor},
+ {QLatin1String(":/utils/images/toolbuttonexpandarrow.png"), Theme::IconsBaseColor}});
const Icon LINK({
{QLatin1String(":/utils/images/linkicon.png"), Theme::PanelTextColorMid}}, Icon::Tint);
const Icon LINK_TOOLBAR({
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp
index 8f7c56dab9..e1976771ab 100644
--- a/src/plugins/autotest/gtest/gtesttreeitem.cpp
+++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp
@@ -33,8 +33,9 @@
#include <cpptools/cppmodelmanager.h>
#include <projectexplorer/session.h>
#include <utils/algorithm.h>
+#include <utils/icon.h>
#include <utils/qtcassert.h>
-#include <utils/utilsicons.h>
+#include <utils/theme/theme.h>
#include <QRegExp>
@@ -112,7 +113,9 @@ QVariant GTestTreeItem::data(int column, int role) const
case Qt::DecorationRole:
if (type() == GroupNode
&& GTestFramework::groupMode() == GTest::Constants::GTestFilter) {
- return Utils::Icons::FILTER.icon(); // TODO replace by an 'inked' filter w/o arrow
+ static const QIcon filterIcon = Utils::Icon({{":/utils/images/filtericon.png",
+ Utils::Theme::PanelTextColorMid}}).icon();
+ return filterIcon;
}
break;
case Qt::ToolTipRole:
diff --git a/src/plugins/autotest/qtest/qttestresult.cpp b/src/plugins/autotest/qtest/qttestresult.cpp
index 8655f690cd..f3ca1ebe0e 100644
--- a/src/plugins/autotest/qtest/qttestresult.cpp
+++ b/src/plugins/autotest/qtest/qttestresult.cpp
@@ -205,7 +205,8 @@ bool QtTestResult::matchesTestFunction(const TestTreeItem *item) const
}
if (type == TestTreeItem::TestDataTag) {
TestTreeItem *grandParentItem = parentItem->parentItem();
- return parentItem->name() == m_function && grandParentItem->name() == name();
+ return parentItem->name() == m_function && grandParentItem->name() == name()
+ && item->name() == m_dataTag;
}
return item->name() == m_function && parentItem->name() == name();
}
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index 845900fb0e..acba89331b 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -87,6 +87,8 @@ bool Uncrustify::initialize()
connect(m_settings, &UncrustifySettings::supportedMimeTypesChanged,
[this] { updateActions(Core::EditorManager::currentEditor()); });
+ new UncrustifyOptionsPage(m_settings, this);
+
return true;
}
diff --git a/src/plugins/clangtools/clangfileinfo.h b/src/plugins/clangtools/clangfileinfo.h
index a543ca1f27..735028a1f9 100644
--- a/src/plugins/clangtools/clangfileinfo.h
+++ b/src/plugins/clangtools/clangfileinfo.h
@@ -36,12 +36,24 @@ namespace Internal {
class FileInfo
{
public:
+ FileInfo() = default;
+ FileInfo(Utils::FileName file,
+ CppTools::ProjectFile::Kind kind,
+ CppTools::ProjectPart::Ptr projectPart)
+ : file(std::move(file))
+ , kind(kind)
+ , projectPart(projectPart)
+ {}
Utils::FileName file;
CppTools::ProjectFile::Kind kind;
CppTools::ProjectPart::Ptr projectPart;
};
-using FileInfos = QVector<FileInfo>;
+inline bool operator==(const FileInfo &lhs, const FileInfo &rhs) {
+ return lhs.file == rhs.file;
+}
+
+using FileInfos = std::vector<FileInfo>;
} // namespace Internal
} // namespace ClangTools
diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
index dce0b9665a..26089ea930 100644
--- a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
+++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
@@ -42,11 +42,11 @@ using namespace Utils;
namespace ClangTools {
namespace Internal {
-int FixitsRefactoringFile::position(unsigned line, unsigned column) const
+int FixitsRefactoringFile::position(const QString &filePath, unsigned line, unsigned column) const
{
QTC_ASSERT(line != 0, return -1);
QTC_ASSERT(column != 0, return -1);
- return document()->findBlockByNumber(line - 1).position() + column - 1;
+ return document(filePath)->findBlockByNumber(line - 1).position() + column - 1;
}
static QDebug operator<<(QDebug debug, const ReplacementOperation &op)
@@ -71,23 +71,22 @@ bool FixitsRefactoringFile::apply()
QTC_ASSERT(!m_filePath.isEmpty(), return false);
- // Check for permissions
- if (!QFileInfo(m_filePath).isWritable())
- return false; // Error file not writable
-
// Apply changes
- QTextDocument *doc = document();
- QTextCursor cursor(doc);
-
for (int i=0; i < m_replacementOperations.size(); ++i) {
ReplacementOperation &op = *m_replacementOperations[i];
if (op.apply) {
+ // Check for permissions
+ if (!QFileInfo(op.fileName).isWritable())
+ return false; // Error file not writable
+
qCDebug(fixitsLog) << " " << i << "Applying" << op;
// Shift subsequent operations that are affected
shiftAffectedReplacements(op, i + 1);
// Apply
+ QTextDocument *doc = document(op.fileName);
+ QTextCursor cursor(doc);
cursor.setPosition(op.pos);
cursor.setPosition(op.pos + op.length, QTextCursor::KeepAnchor);
cursor.insertText(op.text);
@@ -99,40 +98,45 @@ bool FixitsRefactoringFile::apply()
return false; // Error reading file
QString error;
- if (!m_textFileFormat.writeFile(m_filePath, doc->toPlainText(), &error)) {
- qCDebug(fixitsLog) << "ERROR: Could not write file" << m_filePath << ":" << error;
- return false; // Error writing file
+ for (auto it = m_documents.begin(); it != m_documents.end(); ++it) {
+ if (!m_textFileFormat.writeFile(it.key(), it.value()->toPlainText(), &error)) {
+ qCDebug(fixitsLog) << "ERROR: Could not write file" << it.key() << ":" << error;
+ return false; // Error writing file
+ }
}
return true;
}
-QTextDocument *FixitsRefactoringFile::document() const
+QTextDocument *FixitsRefactoringFile::document(const QString &filePath) const
{
- if (!m_document) {
+ if (m_documents.find(filePath) == m_documents.end()) {
QString fileContents;
- if (!m_filePath.isEmpty()) {
+ if (!filePath.isEmpty()) {
QString error;
QTextCodec *defaultCodec = Core::EditorManager::defaultTextCodec();
TextFileFormat::ReadResult result = TextFileFormat::readFile(
- m_filePath, defaultCodec,
+ filePath, defaultCodec,
&fileContents, &m_textFileFormat,
&error);
if (result != TextFileFormat::ReadSuccess) {
- qCDebug(fixitsLog) << "ERROR: Could not read " << m_filePath << ":" << error;
+ qCDebug(fixitsLog) << "ERROR: Could not read " << filePath << ":" << error;
m_textFileFormat.codec = nullptr;
}
}
// always make a QTextDocument to avoid excessive null checks
- m_document = new QTextDocument(fileContents);
+ m_documents[filePath] = new QTextDocument(fileContents);
}
- return m_document;
+ return m_documents[filePath];
}
void FixitsRefactoringFile::shiftAffectedReplacements(const ReplacementOperation &op, int startIndex)
{
for (int i = startIndex; i < m_replacementOperations.size(); ++i) {
ReplacementOperation &current = *m_replacementOperations[i];
+ if (op.fileName != current.fileName)
+ continue;
+
ReplacementOperation before = current;
if (op.pos <= current.pos)
diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.h b/src/plugins/clangtools/clangfixitsrefactoringchanges.h
index c19d14aa02..1ca809f4e7 100644
--- a/src/plugins/clangtools/clangfixitsrefactoringchanges.h
+++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.h
@@ -41,6 +41,7 @@ public:
int pos = -1;
int length = -1;
QString text;
+ QString fileName;
bool apply = false;
};
using ReplacementOperations = QVector<ReplacementOperation *>;
@@ -52,20 +53,21 @@ class FixitsRefactoringFile
public:
FixitsRefactoringFile() = default;
FixitsRefactoringFile(const QString &filePath) : m_filePath(filePath) {}
+ ~FixitsRefactoringFile() { qDeleteAll(m_documents); }
bool isValid() const { return !m_filePath.isEmpty(); }
- int position(unsigned line, unsigned column) const;
+ int position(const QString &filePath, unsigned line, unsigned column) const;
void setReplacements(const ReplacementOperations &ops) { m_replacementOperations = ops; }
bool apply();
private:
- QTextDocument *document() const;
+ QTextDocument *document(const QString &filePath) const;
void shiftAffectedReplacements(const ReplacementOperation &op, int startIndex);
QString m_filePath;
mutable Utils::TextFileFormat m_textFileFormat;
- mutable QTextDocument *m_document = nullptr;
+ mutable QHash<QString, QTextDocument *> m_documents;
ReplacementOperations m_replacementOperations; // Not owned.
};
diff --git a/src/plugins/clangtools/clangselectablefilesdialog.cpp b/src/plugins/clangtools/clangselectablefilesdialog.cpp
index e9cdc42625..08ba746553 100644
--- a/src/plugins/clangtools/clangselectablefilesdialog.cpp
+++ b/src/plugins/clangtools/clangselectablefilesdialog.cpp
@@ -155,7 +155,7 @@ public:
return false;
if (!node->isDir)
- result += static_cast<TreeWithFileInfo *>(node)->info;
+ result.push_back(static_cast<TreeWithFileInfo *>(node)->info);
return true;
});
@@ -194,7 +194,7 @@ private:
Tree *projectDirTree = buildProjectDirTree(project->projectDirectory(),
fileInfos,
outOfBaseDirFiles);
- if (outOfBaseDirFiles.isEmpty()) {
+ if (outOfBaseDirFiles.empty()) {
// Showing the project file and beneath the project dir is pointless in this case,
// so get rid of the root node and modify the project dir node as the new root node.
projectDirTree->name = m_root->name;
@@ -229,7 +229,7 @@ private:
for (const FileInfo &fileInfo : fileInfos) {
if (!fileInfo.file.isChildOf(projectDirNode->fullPath)) {
- outOfBaseDirFiles += fileInfo;
+ outOfBaseDirFiles.push_back(fileInfo);
continue; // Handle these separately.
}
diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp
index e15b968a0d..d3f3d841b7 100644
--- a/src/plugins/clangtools/clangtidyclazytool.cpp
+++ b/src/plugins/clangtools/clangtidyclazytool.cpp
@@ -119,13 +119,14 @@ public:
const Debugger::DiagnosticLocation start = step.ranges.first();
const Debugger::DiagnosticLocation end = step.ranges.last();
- const int startPos = file.position(start.line, start.column);
- const int endPos = file.position(end.line, end.column);
+ const int startPos = file.position(start.filePath, start.line, start.column);
+ const int endPos = file.position(start.filePath, end.line, end.column);
auto op = new ReplacementOperation;
op->pos = startPos;
op->length = endPos - startPos;
op->text = step.message;
+ op->fileName = start.filePath;
op->apply = apply;
replacements += op;
@@ -332,7 +333,7 @@ void ClangTidyClazyTool::startTool(bool askUserForFileSelection)
QTC_ASSERT(project, return);
const FileInfos fileInfos = collectFileInfos(project, askUserForFileSelection);
- if (fileInfos.isEmpty())
+ if (fileInfos.empty())
return;
auto clangTool = new ClangTidyClazyRunControl(runControl,
diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp
index 7c63fa4ee4..248bee44ea 100644
--- a/src/plugins/clangtools/clangtool.cpp
+++ b/src/plugins/clangtools/clangtool.cpp
@@ -78,13 +78,13 @@ static FileInfos sortedFileInfos(const QVector<CppTools::ProjectPart::Ptr> &proj
continue;
if (CppTools::ProjectFile::isSource(file.kind)) {
- const FileInfo info{Utils::FileName::fromString(file.path), file.kind, projectPart};
- fileInfos.append(info);
+ fileInfos.emplace_back(Utils::FileName::fromString(file.path), file.kind, projectPart);
}
}
}
Utils::sort(fileInfos, &FileInfo::file);
+ fileInfos.erase(std::unique(fileInfos.begin(), fileInfos.end()), fileInfos.end());
return fileInfos;
}
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index 28542f7e5e..f8222a3682 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -157,6 +157,7 @@ public:
QFileSystemWatcher *m_fileWatcher = nullptr; // Delayed creation.
QFileSystemWatcher *m_linkWatcher = nullptr; // Delayed creation (only UNIX/if a link is seen).
+ bool m_postponeAutoReload = false;
bool m_blockActivated = false;
bool m_checkOnFocusChange = false;
QString m_lastVisitedDirectory = QDir::currentPath();
@@ -597,6 +598,13 @@ void DocumentManager::unexpectFileChange(const QString &fileName)
updateExpectedState(filePathKey(fileName, ResolveLinks));
}
+void DocumentManager::setAutoReloadPostponed(bool postponed)
+{
+ d->m_postponeAutoReload = postponed;
+ if (!postponed)
+ QTimer::singleShot(500, m_instance, &DocumentManager::checkForReload);
+}
+
static bool saveModifiedFilesHelper(const QList<IDocument *> &documents,
const QString &message, bool *cancelled, bool silently,
const QString &alwaysSaveMessage, bool *alwaysSave,
@@ -990,7 +998,7 @@ void DocumentManager::changedFile(const QString &fileName)
void DocumentManager::checkForReload()
{
- if (d->m_changedFiles.isEmpty())
+ if (d->m_postponeAutoReload || d->m_changedFiles.isEmpty())
return;
if (QApplication::applicationState() != Qt::ApplicationActive)
return;
diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h
index b76e65d962..b74734ac3c 100644
--- a/src/plugins/coreplugin/documentmanager.h
+++ b/src/plugins/coreplugin/documentmanager.h
@@ -69,6 +69,8 @@ public:
static void expectFileChange(const QString &fileName);
static void unexpectFileChange(const QString &fileName);
+ static void setAutoReloadPostponed(bool enabled);
+
// recent files
static void addToRecentFiles(const QString &fileName, Id editorId = Id());
Q_SLOT void clearRecentFiles();
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index a905002921..4fad26bc12 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -29,6 +29,7 @@
#include "fancyactionbar.h"
#include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
#include <utils/styledbar.h>
#include <utils/stylehelper.h>
#include <utils/theme/theme.h>
@@ -599,6 +600,12 @@ void FancyTabWidget::showWidget(int index)
{
emit currentAboutToShow(index);
m_modesStack->setCurrentIndex(index);
+ QWidget *w = m_modesStack->currentWidget();
+ if (QTC_GUARD(w)) {
+ if (QWidget *focusWidget = w->focusWidget())
+ w = focusWidget;
+ w->setFocus();
+ }
emit currentChanged(index);
}
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index fa0c3a59eb..103f2e208e 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -1882,8 +1882,8 @@ bool matchName(const Name *name, QList<Core::LocatorFilterEntry> *matches, QStri
if (!name)
return false;
- if (CppClassesFilter *classesFilter
- = ExtensionSystem::PluginManager::getObject<CppClassesFilter>()) {
+ if (Core::ILocatorFilter *classesFilter
+ = CppTools::CppModelManager::instance()->classesFilter()) {
QFutureInterface<Core::LocatorFilterEntry> dummy;
const Overview oo;
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 786d874786..3c2dba239e 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -129,28 +129,10 @@ void CompilerOptionsBuilder::enableExceptions()
add(QLatin1String("-fexceptions"));
}
-static Utils::FileName absoluteDirectory(const QString &filePath)
-{
- return Utils::FileName::fromString(QFileInfo(filePath + '/').absolutePath());
-}
-
-static Utils::FileName projectTopLevelDirectory(const ProjectPart &projectPart)
-{
- if (!projectPart.project)
- return Utils::FileName();
- const Utils::FileName result = projectPart.project->projectDirectory();
- const Utils::FileName vcsTopLevel = Utils::FileName::fromString(
- Core::VcsManager::findTopLevelForDirectory(result.toString()));
- if (result.isChildOf(vcsTopLevel))
- return vcsTopLevel;
- return result;
-}
-
void CompilerOptionsBuilder::addHeaderPathOptions()
{
typedef ProjectPartHeaderPath HeaderPath;
const QString defaultPrefix = includeDirOption();
- const Utils::FileName projectDirectory = projectTopLevelDirectory(m_projectPart);
QStringList result;
@@ -170,14 +152,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions()
default: // This shouldn't happen, but let's be nice..:
// intentional fall-through:
case HeaderPath::IncludePath:
- path = absoluteDirectory(headerPath.path);
- if (projectDirectory.isEmpty()
- || path == projectDirectory
- || path.isChildOf(projectDirectory)) {
- prefix = defaultPrefix;
- } else {
- prefix = SYSTEM_INCLUDE_PREFIX;
- }
+ prefix = defaultPrefix;
break;
}
diff --git a/src/plugins/cpptools/cpplocatorfilter_test.cpp b/src/plugins/cpptools/cpplocatorfilter_test.cpp
index 2759021956..a9fc6e3405 100644
--- a/src/plugins/cpptools/cpplocatorfilter_test.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter_test.cpp
@@ -96,7 +96,7 @@ class CppCurrentDocumentFilterTestCase
public:
CppCurrentDocumentFilterTestCase(const QString &fileName,
const ResultDataList &expectedResults)
- : BasicLocatorFilterTest(PluginManager::getObject<CppCurrentDocumentFilter>())
+ : BasicLocatorFilterTest(CppTools::CppModelManager::instance()->currentDocumentFilter())
, m_editor(0)
, m_fileName(fileName)
{
@@ -158,9 +158,11 @@ void CppToolsPlugin::test_cpplocatorfilters_CppLocatorFilter_data()
QTest::addColumn<QString>("searchText");
QTest::addColumn<ResultDataList>("expectedResults");
- ILocatorFilter *cppFunctionsFilter = PluginManager::getObject<CppFunctionsFilter>();
- ILocatorFilter *cppClassesFilter = PluginManager::getObject<CppClassesFilter>();
- ILocatorFilter *cppLocatorFilter = PluginManager::getObject<CppLocatorFilter>();
+ CppModelManager *cppModelManager = CppModelManager::instance();
+
+ ILocatorFilter *cppFunctionsFilter = cppModelManager->functionsFilter();
+ ILocatorFilter *cppClassesFilter = cppModelManager->classesFilter();
+ ILocatorFilter *cppLocatorFilter = cppModelManager->locatorFilter();
MyTestDataDir testDirectory("testdata_basic");
const QString testFile = testDirectory.file("file1.cpp");
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index d310f15f1d..2eacfdef5c 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -390,6 +390,36 @@ void CppModelManager::setCurrentDocumentFilter(std::unique_ptr<Core::ILocatorFil
setFilter(d->m_currentDocumentFilter, std::move(filter));
}
+Core::ILocatorFilter *CppModelManager::locatorFilter() const
+{
+ return d->m_locatorFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::classesFilter() const
+{
+ return d->m_classesFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::includesFilter() const
+{
+ return d->m_includesFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::functionsFilter() const
+{
+ return d->m_functionsFilter.get();
+}
+
+Core::IFindFilter *CppModelManager::symbolsFindFilter() const
+{
+ return d->m_symbolsFindFilter.get();
+}
+
+Core::ILocatorFilter *CppModelManager::currentDocumentFilter() const
+{
+ return d->m_currentDocumentFilter.get();
+}
+
FollowSymbolInterface &CppModelManager::followSymbolInterface() const
{
return d->m_activeModelManagerSupport->followSymbolInterface();
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h
index 425ab8712e..aad7333073 100644
--- a/src/plugins/cpptools/cppmodelmanager.h
+++ b/src/plugins/cpptools/cppmodelmanager.h
@@ -219,6 +219,13 @@ public:
void setSymbolsFindFilter(std::unique_ptr<Core::IFindFilter> &&filter);
void setCurrentDocumentFilter(std::unique_ptr<Core::ILocatorFilter> &&filter);
+ Core::ILocatorFilter *locatorFilter() const;
+ Core::ILocatorFilter *classesFilter() const;
+ Core::ILocatorFilter *includesFilter() const;
+ Core::ILocatorFilter *functionsFilter() const;
+ Core::IFindFilter *symbolsFindFilter() const;
+ Core::ILocatorFilter *currentDocumentFilter() const;
+
void renameIncludes(const QString &oldFileName, const QString &newFileName);
signals:
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 1526b6869a..4a904c91ce 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -486,6 +486,7 @@ void DebuggerEngine::start()
d->m_runTool->runControl()->setApplicationProcessHandle(d->m_inferiorPid);
action(OperateByInstruction)->setEnabled(hasCapability(DisassemblerCapability));
+ action(OperateByInstruction)->setChecked(boolSetting(OperateByInstruction));
QTC_ASSERT(state() == DebuggerNotReady || state() == DebuggerFinished,
qDebug() << state());
@@ -534,8 +535,10 @@ void DebuggerEngine::gotoLocation(const Location &loc)
const QString file = QDir::cleanPath(loc.fileName());
const int line = loc.lineNumber();
bool newEditor = false;
- IEditor *editor = EditorManager::openEditor(file, Id(),
- EditorManager::IgnoreNavigationHistory, &newEditor);
+ IEditor *editor = EditorManager::openEditor(
+ file, Id(),
+ EditorManager::IgnoreNavigationHistory | EditorManager::DoNotSwitchToDesignMode,
+ &newEditor);
QTC_ASSERT(editor, return); // Unreadable file?
editor->gotoLine(line, 0, !boolSetting(StationaryEditorWhileStepping));
diff --git a/src/plugins/modeleditor/elementtasks.cpp b/src/plugins/modeleditor/elementtasks.cpp
index 3ace1bec41..f20134fb28 100644
--- a/src/plugins/modeleditor/elementtasks.cpp
+++ b/src/plugins/modeleditor/elementtasks.cpp
@@ -108,7 +108,8 @@ bool ElementTasks::hasClassDefinition(const qmt::MElement *element) const
? klass->name()
: klass->umlNamespace() + "::" + klass->name();
- CppTools::CppClassesFilter *classesFilter = ExtensionSystem::PluginManager::getObject<CppTools::CppClassesFilter>();
+ Core::ILocatorFilter *classesFilter
+ = CppTools::CppModelManager::instance()->classesFilter();
if (!classesFilter)
return false;
@@ -144,7 +145,8 @@ void ElementTasks::openClassDefinition(const qmt::MElement *element)
? klass->name()
: klass->umlNamespace() + "::" + klass->name();
- CppTools::CppClassesFilter *classesFilter = ExtensionSystem::PluginManager::getObject<CppTools::CppClassesFilter>();
+ Core::ILocatorFilter *classesFilter
+ = CppTools::CppModelManager::instance()->classesFilter();
if (!classesFilter)
return;
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index ab9ce4b195..29d427e847 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -160,7 +160,7 @@ ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *pare
connect(WinDebugInterface::instance(), &WinDebugInterface::cannotRetrieveDebugOutput,
this, &ApplicationLauncherPrivate::cannotRetrieveLocalDebugOutput);
connect(WinDebugInterface::instance(), &WinDebugInterface::debugOutput,
- this, &ApplicationLauncherPrivate::checkLocalDebugOutput, Qt::BlockingQueuedConnection);
+ this, &ApplicationLauncherPrivate::checkLocalDebugOutput);
#endif
}
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index 6284c33d05..b2fc067de8 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -604,6 +604,7 @@ bool FolderNode::isAncesterOf(Node *n)
bool FolderNode::replaceSubtree(Node *oldNode, std::unique_ptr<Node> &&newNode)
{
+ std::unique_ptr<Node> keepAlive;
if (!oldNode) {
addNode(std::move(newNode)); // Happens e.g. when a project is registered
} else {
@@ -614,9 +615,10 @@ bool FolderNode::replaceSubtree(Node *oldNode, std::unique_ptr<Node> &&newNode)
QTC_ASSERT(it != m_nodes.end(), return false);
if (newNode) {
newNode->setParentFolderNode(this);
+ keepAlive = std::move(*it);
*it = std::move(newNode);
} else {
- takeNode(oldNode); // Happens e.g. when project is shutting down
+ keepAlive = takeNode(oldNode); // Happens e.g. when project is shutting down
}
}
handleSubTreeChanged(this);
diff --git a/src/plugins/projectexplorer/taskmodel.cpp b/src/plugins/projectexplorer/taskmodel.cpp
index 35929efbaf..981f85651d 100644
--- a/src/plugins/projectexplorer/taskmodel.cpp
+++ b/src/plugins/projectexplorer/taskmodel.cpp
@@ -331,10 +331,18 @@ TaskFilterModel::TaskFilterModel(TaskModel *sourceModel, QObject *parent) : QAbs
connect(m_sourceModel, &QAbstractItemModel::rowsInserted,
this, &TaskFilterModel::handleNewRows);
+
connect(m_sourceModel, &QAbstractItemModel::rowsAboutToBeRemoved,
this, &TaskFilterModel::handleRowsAboutToBeRemoved);
+ connect(m_sourceModel, &QAbstractItemModel::rowsRemoved,
+ this, [this](const QModelIndex &parent, int, int) {
+ QTC_ASSERT(!parent.isValid(), return);
+ endRemoveRows();
+ });
+
connect(m_sourceModel, &QAbstractItemModel::modelReset,
- this, &TaskFilterModel::handleReset);
+ this, &TaskFilterModel::invalidateFilter);
+
connect(m_sourceModel, &QAbstractItemModel::dataChanged,
this, &TaskFilterModel::handleDataChanged);
@@ -383,8 +391,9 @@ static QPair<int, int> findFilteredRange(int first, int last, const QList<int> &
void TaskFilterModel::handleNewRows(const QModelIndex &index, int first, int last)
{
- if (index.isValid())
- return;
+ QTC_ASSERT(!index.isValid(), return);
+
+ const int newItemCount = last - first + 1;
QList<int> newMapping;
for (int i = first; i <= last; ++i) {
@@ -393,8 +402,8 @@ void TaskFilterModel::handleNewRows(const QModelIndex &index, int first, int las
newMapping.append(i);
}
- const int newItems = newMapping.count();
- if (!newItems)
+ const int newMappingCount = newMapping.count();
+ if (!newMappingCount)
return;
int filteredFirst = -1;
@@ -403,36 +412,35 @@ void TaskFilterModel::handleNewRows(const QModelIndex &index, int first, int las
else
filteredFirst = std::lower_bound(m_mapping.constBegin(), m_mapping.constEnd(), first) - m_mapping.constBegin();
- const int filteredLast = filteredFirst + newItems - 1;
+ const int filteredLast = filteredFirst + newMappingCount - 1;
beginInsertRows(QModelIndex(), filteredFirst, filteredLast);
if (filteredFirst == m_mapping.count()) {
m_mapping.append(newMapping);
} else {
- QList<int> rest = m_mapping.mid(filteredFirst);
+ const QList<int> rest = m_mapping.mid(filteredFirst);
- m_mapping.reserve(m_mapping.count() + newItems);
+ m_mapping.reserve(m_mapping.count() + newMappingCount);
m_mapping.erase(m_mapping.begin() + filteredFirst, m_mapping.end());
m_mapping.append(newMapping);
- foreach (int pos, rest)
- m_mapping.append(pos + newItems);
+ for (int pos : rest)
+ m_mapping.append(pos + newItemCount);
}
endInsertRows();
}
void TaskFilterModel::handleRowsAboutToBeRemoved(const QModelIndex &index, int first, int last)
{
- if (index.isValid())
- return;
+ QTC_ASSERT(!index.isValid(), return);
const QPair<int, int> range = findFilteredRange(first, last, m_mapping);
- if (range.first > range.second)
+ if (range.first > range.second) // rows to be removed are filtered out
return;
beginRemoveRows(QModelIndex(), range.first, range.second);
m_mapping.erase(m_mapping.begin() + range.first, m_mapping.begin() + range.second + 1);
+ const int sourceRemovedCount = (last - first) + 1;
for (int i = range.first; i < m_mapping.count(); ++i)
- m_mapping[i] = m_mapping.at(i) - (last - first) - 1;
- endRemoveRows();
+ m_mapping[i] = m_mapping.at(i) - sourceRemovedCount;
}
void TaskFilterModel::handleDataChanged(const QModelIndex &top, const QModelIndex &bottom)
@@ -444,24 +452,21 @@ void TaskFilterModel::handleDataChanged(const QModelIndex &top, const QModelInde
emit dataChanged(index(range.first, top.column()), index(range.second, bottom.column()));
}
-void TaskFilterModel::handleReset()
-{
- invalidateFilter();
-}
-
QModelIndex TaskFilterModel::mapFromSource(const QModelIndex &idx) const
{
- auto it = std::lower_bound(m_mapping.constBegin(), m_mapping.constEnd(), idx.row());
- if (it == m_mapping.constEnd() || idx.row() != *it)
+ if (!idx.isValid())
return QModelIndex();
+ auto it = std::lower_bound(m_mapping.constBegin(), m_mapping.constEnd(), idx.row());
+ QTC_ASSERT(it != m_mapping.constEnd() && idx.row() == *it, return QModelIndex());
return index(it - m_mapping.constBegin(), 0);
}
QModelIndex TaskFilterModel::mapToSource(const QModelIndex &index) const
{
- int row = index.row();
- if (row >= m_mapping.count())
+ if (!index.isValid())
return QModelIndex();
+ int row = index.row();
+ QTC_ASSERT(row >= 0 && row < m_mapping.count(), return QModelIndex());
return m_sourceModel->index(m_mapping.at(row), index.column(), index.parent());
}
diff --git a/src/plugins/projectexplorer/taskmodel.h b/src/plugins/projectexplorer/taskmodel.h
index 0b761adabb..b2b1c933e2 100644
--- a/src/plugins/projectexplorer/taskmodel.h
+++ b/src/plugins/projectexplorer/taskmodel.h
@@ -159,7 +159,6 @@ private:
void handleNewRows(const QModelIndex &index, int first, int last);
void handleRowsAboutToBeRemoved(const QModelIndex &index, int first, int last);
void handleDataChanged(const QModelIndex &top, const QModelIndex &bottom);
- void handleReset();
QModelIndex mapToSource(const QModelIndex &index) const;
void invalidateFilter();
diff --git a/src/plugins/projectexplorer/windebuginterface.cpp b/src/plugins/projectexplorer/windebuginterface.cpp
index 98ece143c8..985fec933f 100644
--- a/src/plugins/projectexplorer/windebuginterface.cpp
+++ b/src/plugins/projectexplorer/windebuginterface.cpp
@@ -27,10 +27,11 @@
#ifdef Q_OS_WIN
-#include <windows.h>
+#include <utils/qtcassert.h>
#include <QCoreApplication>
-#include <QMap>
-#include <QTime>
+#include <qt_windows.h>
+
+#include <algorithm>
/*!
\class ProjectExplorer::Internal::WinDebugInterface
@@ -67,6 +68,8 @@ WinDebugInterface::WinDebugInterface(QObject *parent) :
m_instance = this;
m_creatorPid = QCoreApplication::applicationPid();
setObjectName(QLatin1String("WinDebugInterfaceThread"));
+ connect(this, &WinDebugInterface::_q_debugOutputReady,
+ this, &WinDebugInterface::dispatchDebugOutput, Qt::QueuedConnection);
}
WinDebugInterface::~WinDebugInterface()
@@ -131,41 +134,18 @@ bool WinDebugInterface::runLoop()
SetEvent(m_bufferReadyEvent);
- QTime timer; // time since last signal sent
- timer.start();
-
- QMap<qint64, QString> delayedMessages;
-
- auto flushMessages = [this, &delayedMessages, &timer](){
- auto it = delayedMessages.constBegin();
- auto end = delayedMessages.constEnd();
- for (; it != end; ++it)
- emit debugOutput(it.key(), it.value());
- delayedMessages.clear();
- timer.start();
- };
-
while (true) {
- DWORD timeout = INFINITE;
- if (!delayedMessages.isEmpty()) // if we have delayed message, don't wait forever
- timeout = qMax(60 - timer.elapsed(), 1);
- const DWORD ret = WaitForMultipleObjects(HandleCount, m_waitHandles, FALSE, timeout);
-
+ const DWORD ret = WaitForMultipleObjects(HandleCount, m_waitHandles, FALSE, INFINITE);
if (ret == WAIT_FAILED || ret - WAIT_OBJECT_0 == TerminateEventHandle) {
- flushMessages();
+ std::lock_guard<std::mutex> guard(m_outputMutex);
+ emitReadySignal();
break;
}
- if (ret == WAIT_TIMEOUT) {
- flushMessages();
- SetEvent(m_bufferReadyEvent);
- } else if (ret - WAIT_OBJECT_0 == DataReadyEventHandle) {
+ if (ret - WAIT_OBJECT_0 == DataReadyEventHandle) {
if (*processId != m_creatorPid) {
- if (timer.elapsed() < 60) {
- delayedMessages[*processId].append(QString::fromLocal8Bit(message));
- } else {
- delayedMessages[*processId] += QString::fromLocal8Bit(message);
- flushMessages();
- }
+ std::lock_guard<std::mutex> guard(m_outputMutex);
+ m_debugOutput[*processId].push_back(QString::fromLocal8Bit(message));
+ emitReadySignal();
}
SetEvent(m_bufferReadyEvent);
}
@@ -173,6 +153,49 @@ bool WinDebugInterface::runLoop()
return true;
}
+void WinDebugInterface::emitReadySignal()
+{
+ // This function must be called from the WinDebugInterface thread only.
+ QTC_ASSERT(QThread::currentThread() == this, return);
+
+ if (m_debugOutput.empty() || m_readySignalEmitted)
+ return;
+
+ m_readySignalEmitted = true;
+ emit _q_debugOutputReady();
+}
+
+void WinDebugInterface::dispatchDebugOutput()
+{
+ // Called in the thread this object was created in, not in the WinDebugInterfaceThread.
+ QTC_ASSERT(QThread::currentThread() == QCoreApplication::instance()->thread(), return);
+
+ static size_t maxMessagesToSend = 100;
+ std::vector<std::pair<qint64, QString>> output;
+ bool hasMoreOutput = false;
+
+ m_outputMutex.lock();
+ for (auto &entry : m_debugOutput) {
+ std::vector<QString> &src = entry.second;
+ QString dst;
+ size_t n = std::min(maxMessagesToSend, src.size());
+ for (size_t i = 0; i < n; ++i)
+ dst += src.at(i);
+ src.erase(src.begin(), std::next(src.begin(), n));
+ if (!src.empty())
+ hasMoreOutput = true;
+ output.emplace_back(entry.first, std::move(dst));
+ }
+ if (!hasMoreOutput)
+ m_readySignalEmitted = false;
+ m_outputMutex.unlock();
+
+ for (auto p : output)
+ emit debugOutput(p.first, p.second);
+ if (hasMoreOutput)
+ emit _q_debugOutputReady();
+}
+
} // namespace Internal
} // namespace ProjectExplorer
@@ -193,6 +216,10 @@ void WinDebugInterface::run() { }
bool WinDebugInterface::runLoop() { return false; }
+void WinDebugInterface::emitReadySignal() { }
+
+void WinDebugInterface::dispatchDebugOutput() { }
+
} // namespace Internal
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/windebuginterface.h b/src/plugins/projectexplorer/windebuginterface.h
index be3b5e3493..e459394038 100644
--- a/src/plugins/projectexplorer/windebuginterface.h
+++ b/src/plugins/projectexplorer/windebuginterface.h
@@ -25,8 +25,13 @@
#pragma once
+#include <QMap>
#include <QThread>
+#include <map>
+#include <mutex>
+#include <vector>
+
namespace ProjectExplorer {
namespace Internal {
@@ -45,12 +50,15 @@ public:
signals:
void debugOutput(qint64 pid, const QString &message);
void cannotRetrieveDebugOutput();
+ void _q_debugOutputReady();
private:
enum Handles { DataReadyEventHandle, TerminateEventHandle, HandleCount };
void run() override;
bool runLoop();
+ void emitReadySignal();
+ void dispatchDebugOutput();
static WinDebugInterface *m_instance;
@@ -59,6 +67,9 @@ private:
Qt::HANDLE m_bufferReadyEvent = nullptr;
Qt::HANDLE m_sharedFile = nullptr;
void *m_sharedMem = nullptr;
+ std::mutex m_outputMutex;
+ bool m_readySignalEmitted = false;
+ std::map<qint64, std::vector<QString>> m_debugOutput;
};
} // namespace Internal
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index 41ae3acf03..66448835cf 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -45,6 +45,7 @@
#include <utils/qtcprocess.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/stringutils.h>
+#include <utils/temporarydirectory.h>
#include <utils/QtConcurrentTools>
#include <QLoggingCategory>
@@ -1870,9 +1871,11 @@ FileName QmakeProFile::buildDir(QmakeBuildConfiguration *bc) const
const QString relativeDir = srcDirRoot.relativeFilePath(directoryPath().toString());
if (!bc && m_project->activeTarget())
bc = static_cast<QmakeBuildConfiguration *>(m_project->activeTarget()->activeBuildConfiguration());
- if (!bc)
- return { };
- return FileName::fromString(QDir::cleanPath(QDir(bc->buildDirectory().toString()).absoluteFilePath(relativeDir)));
+ const QString buildConfigBuildDir = bc ? bc->buildDirectory().toString() : QString();
+ const QString buildDir = buildConfigBuildDir.isEmpty()
+ ? m_project->projectDirectory().toString()
+ : buildConfigBuildDir;
+ return FileName::fromString(QDir::cleanPath(QDir(buildDir).absoluteFilePath(relativeDir)));
}
FileNameList QmakeProFile::generatedFiles(const FileName &buildDir,
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
index 4978c37026..4b6a21694b 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
@@ -107,6 +107,7 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
FormEditorItem *containerItem = containerFormEditorItem(itemList, m_movingItems);
if (containerItem && view()->currentState().isBaseState()) {
if (containerItem != m_movingItems.constFirst()->parentItem()
+ && event->modifiers().testFlag(Qt::ControlModifier)
&& event->modifiers().testFlag(Qt::ShiftModifier)) {
const FormEditorItem *movingItem = m_movingItems.constFirst();
diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
index c6cde7a320..ab4dba68df 100644
--- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp
@@ -49,6 +49,7 @@
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/qmljssimplereader.h>
+#include <utils/algorithm.h>
#include <utils/changeset.h>
#include <utils/qtcassert.h>
@@ -483,14 +484,20 @@ QString RewriterView::auxiliaryDataAsQML() const
str += QString::number(node.internalId());
str += ";";
- for (auto i = data.begin(); i != data.end(); ++i) {
- const QVariant value = i.value();
+ QStringList keys = Utils::transform(data.keys(), [](const PropertyName &name) {
+ return QString::fromUtf8(name);
+ });
+
+ keys.sort();
+
+ for (const QString &key : keys) {
+ const QVariant value = data.value(key.toUtf8());
QString strValue = value.toString();
if (static_cast<QMetaType::Type>(value.type()) == QMetaType::QString)
strValue = "\"" + strValue + "\"";
if (!strValue.isEmpty()) {
- str += replaceIllegalPropertyNameChars(QString::fromUtf8(i.key())) + ":";
+ str += replaceIllegalPropertyNameChars(key) + ":";
str += strValue;
str += ";";
}
diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp
index bd22558a4e..0728c8128b 100644
--- a/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp
+++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/textedititem.cpp
@@ -27,6 +27,7 @@
#include <formeditorscene.h>
#include <nodemetainfo.h>
+#include <rewritingexception.h>
#include <QLineEdit>
#include <QTextEdit>
@@ -48,12 +49,17 @@ TextEditItem::~TextEditItem()
void TextEditItem::writeTextToProperty()
{
if (m_formEditorItem) {
- if (text().isEmpty())
- m_formEditorItem->qmlItemNode().removeProperty("text");
- else if (m_formEditorItem->qmlItemNode().isTranslatableText("text"))
- m_formEditorItem->qmlItemNode().setBindingProperty("text", QmlObjectNode::generateTranslatableText(text()));
- else
- m_formEditorItem->qmlItemNode().setVariantProperty("text", text());
+ try {
+ if (text().isEmpty())
+ m_formEditorItem->qmlItemNode().removeProperty("text");
+ else if (m_formEditorItem->qmlItemNode().isTranslatableText("text"))
+ m_formEditorItem->qmlItemNode().setBindingProperty("text", QmlObjectNode::generateTranslatableText(text()));
+ else
+ m_formEditorItem->qmlItemNode().setVariantProperty("text", text());
+ }
+ catch (const RewritingException &e) {
+ e.showException();
+ }
}
}
diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
index c9d83b6893..794247b220 100644
--- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp
@@ -85,6 +85,7 @@ namespace {
static const QLatin1String kDetect2Chars("Detect2Chars");
static const QLatin1String kAnyChar("AnyChar");
static const QLatin1String kStringDetect("StringDetect");
+ static const QLatin1String kWordDetect("WordDetect");
static const QLatin1String kRegExpr("RegExpr");
static const QLatin1String kKeyword("keyword");
static const QLatin1String kInt("Int");
@@ -153,6 +154,8 @@ bool HighlightDefinitionHandler::startElement(const QString &,
anyCharStarted(atts);
else if (qName == kStringDetect)
stringDetectedStarted(atts);
+ else if (qName == kWordDetect)
+ wordDetectStarted(atts);
else if (qName == kRegExpr)
regExprStarted(atts);
else if (qName == kKeyword)
@@ -189,7 +192,8 @@ bool HighlightDefinitionHandler::endElement(const QString &, const QString &, co
m_currentList->addKeyword(m_currentKeyword.trimmed());
m_processingKeyword = false;
} else if (qName == kDetectChar || qName == kDetect2Chars || qName == kAnyChar ||
- qName == kStringDetect || qName == kRegExpr || qName == kKeyword || qName == kInt ||
+ qName == kStringDetect || qName == kWordDetect || qName == kRegExpr ||
+ qName == kKeyword || qName == kInt ||
qName == kFloat || qName == kHlCOct || qName == kHlCHex || qName == kHlCStringChar ||
qName == kHlCChar || qName == kRangeDetect || qName == kLineContinue ||
qName == kDetectSpaces || qName == kDetectIdentifier) {
@@ -333,6 +337,15 @@ void HighlightDefinitionHandler::stringDetectedStarted(const QXmlAttributes &att
ruleElementStarted(atts, QSharedPointer<Rule>(rule));
}
+void HighlightDefinitionHandler::wordDetectStarted(const QXmlAttributes &atts)
+{
+ WordDetectRule *rule = new WordDetectRule;
+ rule->setString(atts.value(kString));
+ rule->setInsensitive(atts.value(kInsensitive));
+ rule->setActive(atts.value(kDynamic));
+ ruleElementStarted(atts, QSharedPointer<Rule>(rule));
+}
+
void HighlightDefinitionHandler::regExprStarted(const QXmlAttributes &atts)
{
RegExprRule *rule = new RegExprRule;
diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h
index 44f5b3004e..db3d97704b 100644
--- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h
+++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h
@@ -67,6 +67,7 @@ private:
void detect2CharsStarted(const QXmlAttributes &atts);
void anyCharStarted(const QXmlAttributes &atts);
void stringDetectedStarted(const QXmlAttributes &atts);
+ void wordDetectStarted(const QXmlAttributes &atts);
void regExprStarted(const QXmlAttributes &atts);
void keywordStarted(const QXmlAttributes &atts);
void intStarted(const QXmlAttributes &atts);
diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp
index 82a9de23ca..0963f62115 100644
--- a/src/plugins/texteditor/generichighlighter/specificrules.cpp
+++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp
@@ -171,6 +171,21 @@ bool StringDetectRule::doMatchSucceed(const QString &text,
return false;
}
+bool WordDetectRule::doMatchSucceed(const QString &text, const int length, ProgressData *progress)
+{
+ const int offset = progress->offset();
+ if (length - offset < m_length)
+ return false;
+ if (offset > 0 && !definition()->isDelimiter(text.at(offset - 1)))
+ return false;
+ if (text.midRef(offset, m_string.size()).compare(m_string, m_caseSensitivity) != 0)
+ return false;
+ if (length > offset + m_string.size() && !definition()->isDelimiter(text.at(offset + m_string.size())))
+ return false;
+ progress->incrementOffset(m_length);
+ return true;
+}
+
// RegExpr
RegExprRule::~RegExprRule()
{
diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h
index a5533dcd0d..c4a76e0771 100644
--- a/src/plugins/texteditor/generichighlighter/specificrules.h
+++ b/src/plugins/texteditor/generichighlighter/specificrules.h
@@ -99,7 +99,7 @@ public:
void setString(const QString &s);
void setInsensitive(const QString &insensitive);
-private:
+protected:
virtual bool doMatchSucceed(const QString &text,
const int length,
ProgressData *progress);
@@ -111,6 +111,15 @@ private:
Qt::CaseSensitivity m_caseSensitivity = Qt::CaseSensitive;
};
+class WordDetectRule : public StringDetectRule
+{
+private:
+ virtual bool doMatchSucceed(const QString &text,
+ const int length,
+ ProgressData *progress);
+ virtual WordDetectRule *doClone() const { return new WordDetectRule(*this); }
+};
+
class RegExprRule : public DynamicRule
{
public:
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 71818d1e93..8ad2cacf56 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -351,6 +351,8 @@ public:
void onHandlerFinished(int documentRevision, int position, int priority)
{
+ if (!m_widget)
+ return;
QTC_ASSERT(m_currentHandlerIndex < m_handlers.size(), return);
QTC_ASSERT(documentRevision == m_documentRevision, return);
QTC_ASSERT(position == m_position, return);
@@ -376,7 +378,7 @@ public:
}
private:
- TextEditorWidget *m_widget = nullptr;
+ QPointer<TextEditorWidget> m_widget;
const QList<BaseHoverHandler *> &m_handlers;
struct LastHandlerInfo {
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 679d7e6aa5..c79776a8e3 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -1303,14 +1303,14 @@ int VcsBaseEditor::lineNumberOfCurrentEditor(const QString &currentFile)
const BaseTextEditor *eda = qobject_cast<const BaseTextEditor *>(ed);
if (!eda)
return -1;
- const int cursorLine = eda->textCursor().blockNumber();
+ const int cursorLine = eda->textCursor().blockNumber() + 1;
auto const edw = qobject_cast<const TextEditorWidget *>(ed->widget());
if (edw) {
- const int firstLine = edw->firstVisibleBlockNumber();
- const int lastLine = edw->lastVisibleBlockNumber();
+ const int firstLine = edw->firstVisibleBlockNumber() + 1;
+ const int lastLine = edw->lastVisibleBlockNumber() + 1;
if (firstLine <= cursorLine && cursorLine < lastLine)
return cursorLine;
- return edw->centerVisibleBlockNumber();
+ return edw->centerVisibleBlockNumber() + 1;
}
return cursorLine;
}
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index cf10769711..26db328083 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -27,6 +27,7 @@
#include "vcsbaseplugin.h"
#include "vcsoutputwindow.h"
+#include <coreplugin/documentmanager.h>
#include <coreplugin/vcsmanager.h>
#include <utils/synchronousprocess.h>
@@ -56,6 +57,14 @@ VcsCommand::VcsCommand(const QString &workingDirectory,
return proxy;
});
+ connect(this, &VcsCommand::started, this, [this] {
+ if (flags() & ExpectRepoChanges)
+ Core::DocumentManager::setAutoReloadPostponed(true);
+ });
+ connect(this, &VcsCommand::finished, this, [this] {
+ if (flags() & ExpectRepoChanges)
+ Core::DocumentManager::setAutoReloadPostponed(false);
+ });
}
const QProcessEnvironment VcsCommand::processEnvironment() const
diff --git a/src/plugins/winrt/winrtdeployconfiguration.cpp b/src/plugins/winrt/winrtdeployconfiguration.cpp
index b959cdadf5..a169305173 100644
--- a/src/plugins/winrt/winrtdeployconfiguration.cpp
+++ b/src/plugins/winrt/winrtdeployconfiguration.cpp
@@ -87,6 +87,9 @@ WinRtDeployStepFactory::WinRtDeployStepFactory()
setDisplayName(QCoreApplication::translate("WinRt::Internal::WinRtDeployStepFactory", "Run windeployqt"));
setFlags(BuildStepInfo::Unclonable);
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+ setSupportedDeviceTypes({Constants::WINRT_DEVICE_TYPE_LOCAL,
+ Constants::WINRT_DEVICE_TYPE_EMULATOR,
+ Constants::WINRT_DEVICE_TYPE_PHONE});
setRepeatable(false);
}
diff --git a/src/share/3rdparty/generic-highlighter/bash.xml b/src/share/3rdparty/generic-highlighter/bash.xml
index 11019ea622..48ac94f460 100644
--- a/src/share/3rdparty/generic-highlighter/bash.xml
+++ b/src/share/3rdparty/generic-highlighter/bash.xml
@@ -8,7 +8,7 @@
<!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
<!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
]>
-<language name="Bash" version="6" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<language name="Bash" version="8" kateversion="5.0" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
<!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
@@ -540,7 +540,7 @@
<RegExpr attribute="Variable" context="AssignSubscr" String="\b&varname;(?=\[.+\]\+?=)" />
<!-- handle functions with function keyword before keywords -->
<StringDetect attribute="Function" context="#stay" String=":()" />
- <RegExpr attribute="Keyword" context="FunctionDef" String="\bfunction\b" />
+ <WordDetect attribute="Keyword" context="FunctionDef" String="function" />
<!-- mark function definitions without function keyword -->
<RegExpr attribute="Function" context="#stay" String="&funcname;\s*\(\)" />
<!-- handle keywords -->
@@ -551,7 +551,7 @@
<!-- handle here-string -->
<RegExpr attribute="Redirection" context="#stay" String="\d*&lt;&lt;&lt;" />
<!-- handle here document -->
- <StringDetect attribute="Redirection" context="HereDoc" String="&lt;&lt;" lookAhead="true" />
+ <Detect2Chars attribute="Redirection" context="HereDoc" char="&lt;" char1="&lt;" lookAhead="true" />
<!-- handle process subst -->
<RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
<!-- handle redirection -->
@@ -580,7 +580,7 @@
<!-- handle here-string -->
<RegExpr attribute="Redirection" context="#stay" String="\d*&lt;&lt;&lt;" />
<!-- handle here document -->
- <StringDetect attribute="Redirection" context="HereDoc" String="&lt;&lt;" lookAhead="true" />
+ <Detect2Chars attribute="Redirection" context="HereDoc" char="&lt;" char1="&lt;" lookAhead="true" />
<!-- handle process subst -->
<RegExpr attribute="Redirection" context="ProcessSubst" String="[&lt;&gt;]\(" />
<!-- handle redirection -->
@@ -647,7 +647,7 @@
<RegExpr attribute="Variable" context="VarBrace" String="\$\{[*@#?$!_0-9-](?=[:#%/=?+-])" />
<StringDetect attribute="Variable" context="ExprDblParenSubst" String="$((" beginRegion="expression" />
<StringDetect attribute="Redirection" context="SubstFile" String="$(&lt;" />
- <StringDetect attribute="Variable" context="SubstCommand" String="$(" />
+ <Detect2Chars attribute="Variable" context="SubstCommand" char="$" char1="(" />
<DetectChar attribute="Backquote" context="SubstBackq" char="`" />
<RegExpr attribute="Escape" context="#stay" String="\\[`$\\]" />
</context>
@@ -902,7 +902,7 @@
<RegExpr attribute="Redirection" context="HereDocQ" String="(&lt;&lt;\s*'(&word;)')" lookAhead="true" />
<RegExpr attribute="Redirection" context="HereDocQ" String="(&lt;&lt;\s*\\(&word;))" lookAhead="true" />
<RegExpr attribute="Redirection" context="HereDocNQ" String="(&lt;&lt;\s*(&word;))" lookAhead="true" />
- <StringDetect attribute="Redirection" context="#pop" String="&lt;&lt;" /><!-- always met -->
+ <Detect2Chars attribute="Redirection" context="#pop" char="&lt;" char1="&lt;" /><!-- always met -->
</context>
<context attribute="Normal Text" lineEndContext="#pop" name="HereDocRemainder">
diff --git a/src/share/3rdparty/generic-highlighter/cmake.xml b/src/share/3rdparty/generic-highlighter/cmake.xml
index c0a8cd3e2d..b2eb9747c8 100644
--- a/src/share/3rdparty/generic-highlighter/cmake.xml
+++ b/src/share/3rdparty/generic-highlighter/cmake.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+ <!ENTITY id_re "[_A-Za-z][\-_0-9A-Za-z]*">
+]>
<!--
This file is part of KDE's kate project.
Copyright 2004 Alexander Neundorf (neundorf@kde.org)
Copyright 2005 Dominik Haumann (dhdev@gmx.de)
Copyright 2007,2008,2013,2014 Matthew Woehlke (mw_triad@users.sourceforge.net)
- Copyright 2013,2014,2015 Alex Turbov (i.zaufi@gmail.com)
+ Copyright 2013-2015,2017-2018 Alex Turbov (i.zaufi@gmail.com)
**********************************************************************
* This library is free software; you can redistribute it and/or *
@@ -25,314 +28,392 @@
* Boston, MA 02110-1301, USA. *
**********************************************************************
-->
-<!-- generated for "cmake version 2.8.12.1, 3.0.2, 3.1.2 and 3.3.0" -->
+
<language
name="CMake"
- version="4"
- kateversion="5.0"
+ version="8"
+ kateversion="2.4"
section="Other"
extensions="CMakeLists.txt;*.cmake;*.cmake.in"
style="CMake"
mimetype="text/x-cmake"
- author="Alexander Neundorf (neundorf@kde.org)"
+ author="Alex Turbov (i.zaufi@gmail.com)"
license="LGPLv2+"
>
<highlighting>
- <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
- <list name = "commands">
- <!-- generated list -->
- <item>add_compile_options</item>
- <item>add_custom_command</item>
- <item>add_custom_target</item>
- <item>add_definitions</item>
- <item>add_dependencies</item>
- <item>add_executable</item>
- <item>add_library</item>
- <item>add_subdirectory</item>
- <item>add_test</item>
- <item>aux_source_directory</item>
- <item>break</item>
- <item>build_command</item>
- <item>build_name</item>
- <item>cmake_host_system_information</item>
- <item>cmake_minimum_required</item>
- <item>cmake_policy</item>
- <item>configure_file</item>
- <item>continue</item>
- <item>create_test_sourcelist</item>
- <item>ctest_build</item>
- <item>ctest_configure</item>
- <item>ctest_coverage</item>
- <item>ctest_empty_binary_directory</item>
- <item>ctest_memcheck</item>
- <item>ctest_read_custom_files</item>
- <item>ctest_run_script</item>
- <item>ctest_sleep</item>
- <item>ctest_start</item>
- <item>ctest_submit</item>
- <item>ctest_test</item>
- <item>ctest_update</item>
- <item>ctest_upload</item>
- <item>define_property</item>
- <item>else</item>
- <item>elseif</item>
- <item>enable_language</item>
- <item>enable_testing</item>
- <item>endforeach</item>
- <item>endfunction</item>
- <item>endif</item>
- <item>endmacro</item>
- <item>endwhile</item>
- <item>exec_program</item>
- <item>execute_process</item>
- <item>export</item>
- <item>export_library_dependencies</item>
- <item>file</item>
- <item>find_file</item>
- <item>find_library</item>
- <item>find_package</item>
- <item>find_path</item>
- <item>find_program</item>
- <item>fltk_wrap_ui</item>
- <item>foreach</item>
- <item>function</item>
- <item>get_cmake_property</item>
- <item>get_directory_property</item>
- <item>get_filename_component</item>
- <item>get_property</item>
- <item>get_source_file_property</item>
- <item>get_target_property</item>
- <item>get_test_property</item>
- <item>if</item>
- <item>include</item>
- <item>include_directories</item>
- <item>include_external_msproject</item>
- <item>include_regular_expression</item>
- <item>install</item>
- <item>install_files</item>
- <item>install_programs</item>
- <item>install_targets</item>
- <item>link_directories</item>
- <item>link_libraries</item>
- <item>list</item>
- <item>load_cache</item>
- <item>load_command</item>
- <item>macro</item>
- <item>make_directory</item>
- <item>mark_as_advanced</item>
- <item>math</item>
- <item>message</item>
- <item>option</item>
- <item>output_required_files</item>
- <item>project</item>
- <item>qt_wrap_cpp</item>
- <item>qt_wrap_ui</item>
- <item>remove</item>
- <item>remove_definitions</item>
- <item>return</item>
- <item>separate_arguments</item>
- <item>set</item>
- <item>set_directory_properties</item>
- <item>set_property</item>
- <item>set_source_files_properties</item>
- <item>set_target_properties</item>
- <item>set_tests_properties</item>
- <item>site_name</item>
- <item>source_group</item>
- <item>string</item>
- <item>subdir_depends</item>
- <item>subdirs</item>
- <item>target_compile_definitions</item>
- <item>target_compile_features</item>
- <item>target_compile_options</item>
- <item>target_include_directories</item>
- <item>target_link_libraries</item>
- <item>target_sources</item>
- <item>try_compile</item>
- <item>try_run</item>
- <item>unset</item>
- <item>use_mangled_mesa</item>
- <item>utility_source</item>
- <item>variable_requires</item>
- <item>variable_watch</item>
- <item>while</item>
- <item>write_file</item>
+ <list name="commands">
+ <item>break</item>
+ <item>cmake_host_system_information</item>
+ <item>cmake_minimum_required</item>
+ <item>cmake_parse_arguments</item>
+ <item>cmake_policy</item>
+ <item>configure_file</item>
+ <item>continue</item>
+ <item>elseif</item>
+ <item>else</item>
+ <item>endforeach</item>
+ <item>endfunction</item>
+ <item>endif</item>
+ <item>endmacro</item>
+ <item>endwhile</item>
+ <item>execute_process</item>
+ <item>file</item>
+ <item>find_file</item>
+ <item>find_library</item>
+ <item>find_package</item>
+ <item>find_path</item>
+ <item>find_program</item>
+ <item>foreach</item>
+ <item>function</item>
+ <item>get_cmake_property</item>
+ <item>get_directory_property</item>
+ <item>get_filename_component</item>
+ <item>get_property</item>
+ <item>if</item>
+ <item>include</item>
+ <item>include_guard</item>
+ <item>list</item>
+ <item>macro</item>
+ <item>mark_as_advanced</item>
+ <item>math</item>
+ <item>message</item>
+ <item>option</item>
+ <item>return</item>
+ <item>separate_arguments</item>
+ <item>set_directory_properties</item>
+ <item>set_property</item>
+ <item>set</item>
+ <item>site_name</item>
+ <item>string</item>
+ <item>unset</item>
+ <item>variable_watch</item>
+ <item>while</item>
+ <item>add_compile_definitions</item>
+ <item>add_compile_options</item>
+ <item>add_custom_command</item>
+ <item>add_custom_target</item>
+ <item>add_definitions</item>
+ <item>add_dependencies</item>
+ <item>add_executable</item>
+ <item>add_library</item>
+ <item>add_subdirectory</item>
+ <item>add_test</item>
+ <item>aux_source_directory</item>
+ <item>build_command</item>
+ <item>create_test_sourcelist</item>
+ <item>define_property</item>
+ <item>enable_language</item>
+ <item>enable_testing</item>
+ <item>export</item>
+ <item>fltk_wrap_ui</item>
+ <item>get_source_file_property</item>
+ <item>get_target_property</item>
+ <item>get_test_property</item>
+ <item>include_directories</item>
+ <item>include_external_msproject</item>
+ <item>include_regular_expression</item>
+ <item>install</item>
+ <item>link_directories</item>
+ <item>link_libraries</item>
+ <item>load_cache</item>
+ <item>project</item>
+ <item>qt_wrap_cpp</item>
+ <item>qt_wrap_ui</item>
+ <item>remove_definitions</item>
+ <item>set_source_files_properties</item>
+ <item>set_target_properties</item>
+ <item>set_tests_properties</item>
+ <item>source_group</item>
+ <item>target_compile_definitions</item>
+ <item>target_compile_features</item>
+ <item>target_compile_options</item>
+ <item>target_include_directories</item>
+ <item>target_link_libraries</item>
+ <item>target_sources</item>
+ <item>try_compile</item>
+ <item>try_run</item>
+ <item>ctest_build</item>
+ <item>ctest_configure</item>
+ <item>ctest_coverage</item>
+ <item>ctest_empty_binary_directory</item>
+ <item>ctest_memcheck</item>
+ <item>ctest_read_custom_files</item>
+ <item>ctest_run_script</item>
+ <item>ctest_sleep</item>
+ <item>ctest_start</item>
+ <item>ctest_submit</item>
+ <item>ctest_test</item>
+ <item>ctest_update</item>
+ <item>ctest_upload</item>
</list>
-
- <list name="itkvtk_commands">
- <item>itk_wrap_tcl</item>
- <item>vtk_make_instantiator</item>
- <item>vtk_wrap_java</item>
- <item>vtk_wrap_python</item>
- <item>vtk_wrap_tcl</item>
+
+ <list name="cmake_host_system_information_nargs">
+ <item>QUERY</item>
+ <item>RESULT</item>
</list>
-
- <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
- <list name="special_args">
- <!-- generated list -->
- <item>AFTER</item>
- <item>ALIAS</item>
- <item>ALL</item>
- <item>ALPHABET</item>
+ <list name="cmake_host_system_information_sargs">
+ <item>AVAILABLE_PHYSICAL_MEMORY</item>
+ <item>AVAILABLE_VIRTUAL_MEMORY</item>
+ <item>FQDN</item>
+ <item>HAS_AMD_3DNOW</item>
+ <item>HAS_AMD_3DNOW_PLUS</item>
+ <item>HAS_FPU</item>
+ <item>HAS_IA64</item>
+ <item>HAS_MMX</item>
+ <item>HAS_MMX_PLUS</item>
+ <item>HAS_SERIAL_NUMBER</item>
+ <item>HAS_SSE</item>
+ <item>HAS_SSE2</item>
+ <item>HAS_SSE_FP</item>
+ <item>HAS_SSE_MMX</item>
+ <item>HOSTNAME</item>
+ <item>IS_64BIT</item>
+ <item>NUMBER_OF_LOGICAL_CORES</item>
+ <item>NUMBER_OF_PHYSICAL_CORES</item>
+ <item>OS_NAME</item>
+ <item>OS_PLATFORM</item>
+ <item>OS_RELEASE</item>
+ <item>OS_VERSION</item>
+ <item>PROCESSOR_DESCRIPTION</item>
+ <item>PROCESSOR_NAME</item>
+ <item>PROCESSOR_SERIAL_NUMBER</item>
+ <item>TOTAL_PHYSICAL_MEMORY</item>
+ <item>TOTAL_VIRTUAL_MEMORY</item>
+ </list>
+ <list name="cmake_minimum_required_nargs">
+ <item>FATAL_ERROR</item>
+ <item>VERSION</item>
+ </list>
+ <list name="cmake_parse_arguments_nargs">
+ <item>PARSE_ARGV</item>
+ </list>
+ <list name="cmake_policy_nargs">
+ <item>GET</item>
+ <item>POP</item>
+ <item>PUSH</item>
+ <item>SET</item>
+ <item>VERSION</item>
+ </list>
+ <list name="cmake_policy_sargs">
+ <item>NEW</item>
+ <item>OLD</item>
+ </list>
+ <list name="configure_file_nargs">
+ <item>@ONLY</item>
+ <item>COPYONLY</item>
+ <item>ESCAPE_QUOTES</item>
+ <item>NEWLINE_STYLE</item>
+ </list>
+ <list name="configure_file_sargs">
+ <item>CRLF</item>
+ <item>DOS</item>
+ <item>LF</item>
+ <item>UNIX</item>
+ <item>WIN32</item>
+ </list>
+ <list name="elseif_nargs">
<item>AND</item>
- <item>APPEND</item>
- <item>APPENDNUMBER_ERRORS</item>
- <item>APPEND_STRING</item>
- <item>ARCHIVE</item>
- <item>ARGS</item>
- <item>ASCII</item>
- <item>AUTHOR_WARNING</item>
- <item>BEFORE</item>
- <item>BRIEF_DOCS</item>
- <item>BUILD</item>
- <item>BUNDLE</item>
- <item>BYPRODUCTS</item>
- <item>CACHE</item>
- <item>CACHED_VARIABLE</item>
- <item>CDASH_UPLOAD</item>
- <item>CDASH_UPLOAD_TYPE</item>
- <item>CLEAR</item>
- <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
- <item>CMAKE_FLAGS</item>
- <item>CODE</item>
+ <item>DEFINED</item>
+ <item>EQUAL</item>
+ <item>EXISTS</item>
+ <item>GREATER</item>
+ <item>GREATER_EQUAL</item>
+ <item>IN_LIST</item>
+ <item>IS_ABSOLUTE</item>
+ <item>IS_DIRECTORY</item>
+ <item>IS_NEWER_THAN</item>
+ <item>IS_SYMLINK</item>
+ <item>LESS</item>
+ <item>LESS_EQUAL</item>
+ <item>MATCHES</item>
+ <item>NOT</item>
+ <item>OR</item>
+ <item>POLICY</item>
+ <item>STREQUAL</item>
+ <item>STRGREATER</item>
+ <item>STRGREATER_EQUAL</item>
+ <item>STRLESS</item>
+ <item>STRLESS_EQUAL</item>
+ <item>TARGET</item>
+ <item>TEST</item>
+ <item>VERSION_EQUAL</item>
+ <item>VERSION_GREATER</item>
+ <item>VERSION_GREATER_EQUAL</item>
+ <item>VERSION_LESS</item>
+ <item>VERSION_LESS_EQUAL</item>
+ </list>
+ <list name="execute_process_nargs">
<item>COMMAND</item>
- <item>COMMAND_NAME</item>
- <item>COMMENT</item>
- <item>COMPARE</item>
- <item>COMPILE_DEFINITIONS</item>
- <item>COMPILE_OUTPUT_VARIABLE</item>
- <item>COMPILE_RESULT_VAR</item>
- <item>COMPONENT</item>
- <item>COMPONENTS</item>
- <item>CONCAT</item>
+ <item>ENCODING</item>
+ <item>ERROR_FILE</item>
+ <item>ERROR_QUIET</item>
+ <item>ERROR_STRIP_TRAILING_WHITESPACE</item>
+ <item>ERROR_VARIABLE</item>
+ <item>INPUT_FILE</item>
+ <item>OUTPUT_FILE</item>
+ <item>OUTPUT_QUIET</item>
+ <item>OUTPUT_STRIP_TRAILING_WHITESPACE</item>
+ <item>OUTPUT_VARIABLE</item>
+ <item>RESULTS_VARIABLE</item>
+ <item>RESULT_VARIABLE</item>
+ <item>TIMEOUT</item>
+ <item>WORKING_DIRECTORY</item>
+ </list>
+ <list name="execute_process_sargs">
+ <item>ANSI</item>
+ <item>AUTO</item>
+ <item>NONE</item>
+ <item>OEM</item>
+ <item>UTF8</item>
+ </list>
+ <list name="file_nargs">
+ <item>APPEND</item>
<item>CONDITION</item>
- <item>CONFIG</item>
- <item>CONFIGS</item>
- <item>CONFIGURATION</item>
- <item>CONFIGURATIONS</item>
- <item>CONFIGURE</item>
+ <item>CONFIGURE_DEPENDS</item>
<item>CONTENT</item>
<item>COPY</item>
- <item>COPYONLY</item>
- <item>COPY_FILE</item>
- <item>COPY_FILE_ERROR</item>
- <item>CRLF</item>
- <item>DEFINED</item>
- <item>DEFINITION</item>
- <item>DEPENDS</item>
<item>DESTINATION</item>
<item>DIRECTORY</item>
<item>DIRECTORY_PERMISSIONS</item>
- <item>DOC</item>
- <item>DOS</item>
<item>DOWNLOAD</item>
- <item>ENV</item>
- <item>END</item>
- <item>EQUAL</item>
- <item>ERROR_FILE</item>
- <item>ERROR_QUIET</item>
- <item>ERROR_STRIP_TRAILING_WHITESPACE</item>
- <item>ERROR_VARIABLE</item>
- <item>ESCAPE_QUOTES</item>
- <item>EXACT</item>
+ <item>ENCODING</item>
<item>EXCLUDE</item>
- <item>EXCLUDE_FROM_ALL</item>
- <item>EXCLUDE_LABEL</item>
- <item>EXISTS</item>
<item>EXPECTED_HASH</item>
<item>EXPECTED_MD5</item>
- <item>EXPORT</item>
- <item>EXPORT_LINK_INTERFACE_LIBRARIES</item>
- <item>EXPR</item>
- <item>EXTRA_INCLUDE</item>
- <item>FATAL_ERROR</item>
- <item>FILE</item>
- <item>FILES</item>
<item>FILES_MATCHING</item>
<item>FILE_PERMISSIONS</item>
- <item>FIND</item>
- <item>FLAGS</item>
<item>FOLLOW_SYMLINKS</item>
- <item>FORCE</item>
- <item>FRAMEWORK</item>
- <item>FULL_DOCS</item>
- <item>FUNCTION</item>
<item>GENERATE</item>
- <item>GENEX_STRIP</item>
- <item>GET</item>
<item>GLOB</item>
- <item>GLOBAL</item>
<item>GLOB_RECURSE</item>
- <item>GREATER</item>
- <item>GROUP_EXECUTE</item>
- <item>GROUP_READ</item>
<item>GUARD</item>
- <item>GUID</item>
<item>HEX</item>
- <item>HINTS</item>
- <item>IMPLICIT_DEPENDS</item>
- <item>IMPORTED</item>
- <item>IN</item>
+ <item>HTTPHEADER</item>
<item>INACTIVITY_TIMEOUT</item>
- <item>INCLUDE</item>
- <item>INCLUDES</item>
- <item>INCLUDE_INTERNALS</item>
- <item>INCLUDE_LABEL</item>
- <item>INHERITED</item>
<item>INPUT</item>
- <item>INPUT_FILE</item>
- <item>INSERT</item>
<item>INSTALL</item>
- <item>INTERFACE</item>
- <item>IS_ABSOLUTE</item>
- <item>IS_DIRECTORY</item>
- <item>IS_NEWER_THAN</item>
- <item>IS_SYMLINK</item>
- <item>ITEMS</item>
- <item>LABELS</item>
- <item>LANGUAGES</item>
- <item>LENGTH</item>
<item>LENGTH_MAXIMUM</item>
<item>LENGTH_MINIMUM</item>
- <item>LESS</item>
- <item>LF</item>
- <item>LIBRARY</item>
<item>LIMIT</item>
<item>LIMIT_COUNT</item>
<item>LIMIT_INPUT</item>
<item>LIMIT_OUTPUT</item>
- <item>LINK_INTERFACE_LIBRARIES</item>
- <item>LINK_LIBRARIES</item>
- <item>LINK_PRIVATE</item>
- <item>LINK_PUBLIC</item>
- <item>LISTS</item>
<item>LIST_DIRECTORIES</item>
<item>LOCK</item>
<item>LOG</item>
- <item>MACOSX_BUNDLE</item>
- <item>MAIN_DEPENDENCY</item>
- <item>MAKE_C_IDENTIFIER</item>
<item>MAKE_DIRECTORY</item>
- <item>MATCH</item>
- <item>MATCHALL</item>
- <item>MATCHES</item>
<item>MD5</item>
- <item>MESSAGE_NEVER</item>
- <item>MODULE</item>
- <item>NAME</item>
- <item>NAMELINK_ONLY</item>
- <item>NAMELINK_SKIP</item>
+ <item>NETRC</item>
+ <item>NETRC_FILE</item>
+ <item>NEWLINE_CONSUME</item>
+ <item>NO_HEX_CONVERSION</item>
+ <item>NO_SOURCE_PERMISSIONS</item>
+ <item>OFFSET</item>
+ <item>OUTPUT</item>
+ <item>PATTERN</item>
+ <item>PERMISSIONS</item>
+ <item>READ</item>
+ <item>REGEX</item>
+ <item>RELATIVE</item>
+ <item>RELATIVE_PATH</item>
+ <item>RELEASE</item>
+ <item>REMOVE</item>
+ <item>REMOVE_RECURSE</item>
+ <item>RENAME</item>
+ <item>RESULT_VARIABLE</item>
+ <item>SHA1</item>
+ <item>SHA224</item>
+ <item>SHA256</item>
+ <item>SHA384</item>
+ <item>SHA3_224</item>
+ <item>SHA3_256</item>
+ <item>SHA3_384</item>
+ <item>SHA3_512</item>
+ <item>SHA512</item>
+ <item>SHOW_PROGRESS</item>
+ <item>STATUS</item>
+ <item>STRINGS</item>
+ <item>TIMEOUT</item>
+ <item>TIMESTAMP</item>
+ <item>TLS_CAINFO</item>
+ <item>TLS_VERIFY</item>
+ <item>TOUCH</item>
+ <item>TOUCH_NOCREATE</item>
+ <item>TO_CMAKE_PATH</item>
+ <item>TO_NATIVE_PATH</item>
+ <item>UPLOAD</item>
+ <item>USERPWD</item>
+ <item>USE_SOURCE_PERMISSIONS</item>
+ <item>UTC</item>
+ <item>WRITE</item>
+ </list>
+ <list name="file_sargs">
+ <item>FILE</item>
+ <item>FUNCTION</item>
+ <item>GROUP_EXECUTE</item>
+ <item>GROUP_READ</item>
+ <item>GROUP_WRITE</item>
+ <item>IGNORED</item>
+ <item>OPTIONAL</item>
+ <item>OWNER_EXECUTE</item>
+ <item>OWNER_READ</item>
+ <item>OWNER_WRITE</item>
+ <item>PROCESS</item>
+ <item>REQUIRED</item>
+ <item>SETGID</item>
+ <item>SETUID</item>
+ <item>UTF-16BE</item>
+ <item>UTF-16LE</item>
+ <item>UTF-32B</item>
+ <item>UTF-32LE</item>
+ <item>UTF-8</item>
+ <item>WORLD_EXECUTE</item>
+ <item>WORLD_READ</item>
+ <item>WORLD_WRITE</item>
+ </list>
+ <list name="find_file_nargs">
+ <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
+ <item>DOC</item>
+ <item>HINTS</item>
+ <item>NAMES</item>
+ <item>NO_CMAKE_ENVIRONMENT_PATH</item>
+ <item>NO_CMAKE_FIND_ROOT_PATH</item>
+ <item>NO_CMAKE_PATH</item>
+ <item>NO_CMAKE_SYSTEM_PATH</item>
+ <item>NO_DEFAULT_PATH</item>
+ <item>NO_PACKAGE_ROOT_PATH</item>
+ <item>NO_SYSTEM_ENVIRONMENT_PATH</item>
+ <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
+ <item>PATHS</item>
+ <item>PATH_SUFFIXES</item>
+ </list>
+ <list name="find_library_nargs">
+ <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
+ <item>DOC</item>
+ <item>HINTS</item>
<item>NAMES</item>
- <item>NAMESPACE</item>
<item>NAMES_PER_DIR</item>
- <item>NEW</item>
- <item>NEWLINE_CONSUME</item>
- <item>NEWLINE_STYLE</item>
- <item>NEW_PROCESS</item>
- <item>NOT</item>
- <item>NOTEQUAL</item>
- <item>NO_CMAKE_BUILDS_PATH</item>
+ <item>NO_CMAKE_ENVIRONMENT_PATH</item>
+ <item>NO_CMAKE_FIND_ROOT_PATH</item>
+ <item>NO_CMAKE_PATH</item>
+ <item>NO_CMAKE_SYSTEM_PATH</item>
+ <item>NO_DEFAULT_PATH</item>
+ <item>NO_PACKAGE_ROOT_PATH</item>
+ <item>NO_SYSTEM_ENVIRONMENT_PATH</item>
+ <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
+ <item>PATHS</item>
+ <item>PATH_SUFFIXES</item>
+ </list>
+ <list name="find_package_nargs">
+ <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
+ <item>COMPONENTS</item>
+ <item>CONFIG</item>
+ <item>CONFIGS</item>
+ <item>EXACT</item>
+ <item>HINTS</item>
+ <item>MODULE</item>
+ <item>NAMES</item>
<item>NO_CMAKE_ENVIRONMENT_PATH</item>
<item>NO_CMAKE_FIND_ROOT_PATH</item>
<item>NO_CMAKE_PACKAGE_REGISTRY</item>
@@ -340,441 +421,775 @@
<item>NO_CMAKE_SYSTEM_PACKAGE_REGISTRY</item>
<item>NO_CMAKE_SYSTEM_PATH</item>
<item>NO_DEFAULT_PATH</item>
- <item>NO_HEX_CONVERSION</item>
<item>NO_MODULE</item>
+ <item>NO_PACAKGE_ROOT_PATH</item>
<item>NO_POLICY_SCOPE</item>
- <item>NO_SOURCE_PERMISSIONS</item>
<item>NO_SYSTEM_ENVIRONMENT_PATH</item>
- <item>NUMBER_ERRORS</item>
- <item>NUMBER_WARNINGS</item>
- <item>OBJECT</item>
- <item>OFF</item>
- <item>OFFSET</item>
- <item>OLD</item>
- <item>ON</item>
<item>ONLY_CMAKE_FIND_ROOT_PATH</item>
- <item>OPTIONAL</item>
<item>OPTIONAL_COMPONENTS</item>
- <item>OPTIONS</item>
- <item>OR</item>
- <item>OUTPUT</item>
- <item>OUTPUT_DIRECTORY</item>
- <item>OUTPUT_FILE</item>
- <item>OUTPUT_QUIET</item>
- <item>OUTPUT_STRIP_TRAILING_WHITESPACE</item>
- <item>OUTPUT_VARIABLE</item>
- <item>OWNER_EXECUTE</item>
- <item>OWNER_READ</item>
- <item>OWNER_WRITE</item>
- <item>PACKAGE</item>
- <item>PARALLEL_LEVEL</item>
- <item>PARENT_SCOPE</item>
- <item>PARTS</item>
<item>PATHS</item>
<item>PATH_SUFFIXES</item>
- <item>PATH_TO_MESA</item>
- <item>PATTERN</item>
- <item>PERMISSIONS</item>
- <item>PLATFORM</item>
- <item>POLICY</item>
- <item>POP</item>
- <item>POST_BUILD</item>
- <item>PREORDER</item>
- <item>PRE_BUILD</item>
- <item>PRE_LINK</item>
- <item>PRIVATE</item>
- <item>PRIVATE_HEADER</item>
- <item>PROCESS</item>
+ <item>QUIET</item>
+ <item>REQUIRED</item>
+ </list>
+ <list name="find_path_nargs">
+ <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
+ <item>DOC</item>
+ <item>HINTS</item>
+ <item>NAMES</item>
+ <item>NO_CMAKE_ENVIRONMENT_PATH</item>
+ <item>NO_CMAKE_FIND_ROOT_PATH</item>
+ <item>NO_CMAKE_PATH</item>
+ <item>NO_CMAKE_SYSTEM_PATH</item>
+ <item>NO_DEFAULT_PATH</item>
+ <item>NO_PACKAGE_ROOT_PATH</item>
+ <item>NO_SYSTEM_ENVIRONMENT_PATH</item>
+ <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
+ <item>PATHS</item>
+ <item>PATH_SUFFIXES</item>
+ </list>
+ <list name="find_program_nargs">
+ <item>CMAKE_FIND_ROOT_PATH_BOTH</item>
+ <item>DOC</item>
+ <item>HINTS</item>
+ <item>NAMES</item>
+ <item>NAMES_PER_DIR</item>
+ <item>NO_CMAKE_ENVIRONMENT_PATH</item>
+ <item>NO_CMAKE_FIND_ROOT_PATH</item>
+ <item>NO_CMAKE_PATH</item>
+ <item>NO_CMAKE_SYSTEM_PATH</item>
+ <item>NO_DEFAULT_PATH</item>
+ <item>NO_PACKAGE_ROOT_PATH</item>
+ <item>NO_SYSTEM_ENVIRONMENT_PATH</item>
+ <item>ONLY_CMAKE_FIND_ROOT_PATH</item>
+ <item>PATHS</item>
+ <item>PATH_SUFFIXES</item>
+ </list>
+ <list name="foreach_nargs">
+ <item>IN</item>
+ <item>ITEMS</item>
+ <item>LISTS</item>
+ <item>RANGE</item>
+ </list>
+ <list name="get_directory_property_nargs">
+ <item>DEFINITION</item>
+ <item>DIRECTORY</item>
+ </list>
+ <list name="get_filename_component_nargs">
+ <item>ABSOLUTE</item>
+ <item>BASE_DIR</item>
+ <item>CACHE</item>
+ <item>DIRECTORY</item>
+ <item>EXT</item>
+ <item>NAME</item>
+ <item>NAME_WE</item>
+ <item>PATH</item>
<item>PROGRAM</item>
- <item>PROGRAMS</item>
<item>PROGRAM_ARGS</item>
- <item>PROJECT_NAME</item>
- <item>PROPERTIES</item>
+ <item>REALPATH</item>
+ </list>
+ <list name="get_property_nargs">
+ <item>BRIEF_DOCS</item>
+ <item>CACHE</item>
+ <item>DEFINED</item>
+ <item>DIRECTORY</item>
+ <item>FULL_DOCS</item>
+ <item>GLOBAL</item>
+ <item>INSTALL</item>
<item>PROPERTY</item>
- <item>PUBLIC</item>
- <item>PUBLIC_HEADER</item>
- <item>PUSH</item>
- <item>QUERY</item>
- <item>QUIET</item>
- <item>RANDOM</item>
- <item>RANDOM_SEED</item>
- <item>RANGE</item>
- <item>READ</item>
- <item>READ_WITH_PREFIX</item>
+ <item>SET</item>
+ <item>SOURCE</item>
+ <item>TARGET</item>
+ <item>TEST</item>
+ <item>VARIABLE</item>
+ </list>
+ <list name="if_nargs">
+ <item>AND</item>
+ <item>DEFINED</item>
+ <item>EQUAL</item>
+ <item>EXISTS</item>
+ <item>GREATER</item>
+ <item>GREATER_EQUAL</item>
+ <item>IN_LIST</item>
+ <item>IS_ABSOLUTE</item>
+ <item>IS_DIRECTORY</item>
+ <item>IS_NEWER_THAN</item>
+ <item>IS_SYMLINK</item>
+ <item>LESS</item>
+ <item>LESS_EQUAL</item>
+ <item>MATCHES</item>
+ <item>NOT</item>
+ <item>OR</item>
+ <item>POLICY</item>
+ <item>STREQUAL</item>
+ <item>STRGREATER</item>
+ <item>STRGREATER_EQUAL</item>
+ <item>STRLESS</item>
+ <item>STRLESS_EQUAL</item>
+ <item>TARGET</item>
+ <item>TEST</item>
+ <item>VERSION_EQUAL</item>
+ <item>VERSION_GREATER</item>
+ <item>VERSION_GREATER_EQUAL</item>
+ <item>VERSION_LESS</item>
+ <item>VERSION_LESS_EQUAL</item>
+ </list>
+ <list name="include_nargs">
+ <item>NO_POLICY_SCOPE</item>
+ <item>OPTIONAL</item>
+ <item>RESULT_VARIABLE</item>
+ </list>
+ <list name="include_guard_nargs">
+ <item>DIRECTORY</item>
+ <item>GLOBAL</item>
+ </list>
+ <list name="list_nargs">
+ <item>APPEND</item>
+ <item>AT</item>
+ <item>EXCLUDE</item>
+ <item>FILTER</item>
+ <item>FIND</item>
+ <item>FOR</item>
+ <item>GENEX_STRIP</item>
+ <item>GET</item>
+ <item>INCLUDE</item>
+ <item>INSERT</item>
+ <item>JOIN</item>
+ <item>LENGTH</item>
+ <item>OUTPUT_VARIABLE</item>
+ <item>PREPEND</item>
<item>REGEX</item>
- <item>REGULAR_EXPRESSION</item>
- <item>RELATIVE</item>
- <item>RELATIVE_PATH</item>
- <item>RELEASE</item>
- <item>REMOVE</item>
<item>REMOVE_AT</item>
<item>REMOVE_DUPLICATES</item>
<item>REMOVE_ITEM</item>
- <item>REMOVE_RECURSE</item>
- <item>RENAME</item>
<item>REPLACE</item>
- <item>REQUIRED</item>
- <item>REQUIRED_VARIABLE1</item>
- <item>REQUIRED_VARIABLE2</item>
- <item>RESOURCE</item>
- <item>RESULT</item>
- <item>RESULT_VAR</item>
- <item>RESULT_VARIABLE</item>
- <item>RETRY_COUNT</item>
- <item>RETRY_DELAY</item>
- <item>RETURN_VALUE</item>
<item>REVERSE</item>
- <item>RUNTIME</item>
- <item>RUNTIME_DIRECTORY</item>
- <item>RUN_OUTPUT_VARIABLE</item>
- <item>RUN_RESULT_VAR</item>
- <item>SCHEDULE_RANDOM</item>
- <item>SCRIPT</item>
+ <item>SORT</item>
+ <item>STRIP</item>
+ <item>SUBLIST</item>
+ <item>TOLOWER</item>
+ <item>TRANSFORM</item>
+ </list>
+ <list name="mark_as_advanced_nargs">
+ <item>CLEAR</item>
+ <item>FORCE</item>
+ </list>
+ <list name="math_nargs">
+ <item>EXPR</item>
+ </list>
+ <list name="message_nargs">
+ <item>AUTHOR_WARNING</item>
+ <item>DEPRECATION</item>
+ <item>FATAL_ERROR</item>
<item>SEND_ERROR</item>
- <item>SET</item>
+ <item>STATUS</item>
+ <item>WARNING</item>
+ </list>
+ <list name="separate_arguments_nargs">
+ <item>NATIVE_COMMAND</item>
+ <item>UNIX_COMMAND</item>
+ <item>WINDOWS_COMMAND</item>
+ </list>
+ <list name="set_directory_properties_nargs">
+ <item>PROPERTIES</item>
+ </list>
+ <list name="set_property_nargs">
+ <item>APPEND</item>
+ <item>APPEND_STRING</item>
+ <item>CACHE</item>
+ <item>DIRECTORY</item>
+ <item>GLOBAL</item>
+ <item>INSTALL</item>
+ <item>PROPERTY</item>
+ <item>SOURCE</item>
+ <item>TARGET</item>
+ <item>TEST</item>
+ <item>VARIABLE</item>
+ </list>
+ <list name="set_nargs">
+ <item>CACHE</item>
+ <item>FORCE</item>
+ <item>PARENT_SCOPE</item>
+ </list>
+ <list name="set_sargs">
+ <item>BOOL</item>
+ <item>FILEPATH</item>
+ <item>INTERNAL</item>
+ <item>PATH</item>
+ <item>STATIC</item>
+ <item>STRING</item>
+ </list>
+ <list name="string_nargs">
+ <item>@ONLY</item>
+ <item>ALPHABET</item>
+ <item>APPEND</item>
+ <item>ASCII</item>
+ <item>COMPARE</item>
+ <item>CONCAT</item>
+ <item>CONFIGURE</item>
+ <item>EQUAL</item>
+ <item>ESCAPE_QUOTES</item>
+ <item>FIND</item>
+ <item>GENEX_STRIP</item>
+ <item>GREATER</item>
+ <item>GREATER_EQUAL</item>
+ <item>JOIN</item>
+ <item>LENGTH</item>
+ <item>LESS</item>
+ <item>LESS_EQUAL</item>
+ <item>MAKE_C_IDENTIFIER</item>
+ <item>MATCH</item>
+ <item>MATCHALL</item>
+ <item>MD5</item>
+ <item>NAME</item>
+ <item>NAMESPACE</item>
+ <item>NOTEQUAL</item>
+ <item>PREPEND</item>
+ <item>RANDOM</item>
+ <item>RANDOM_SEED</item>
+ <item>REGEX</item>
+ <item>REPLACE</item>
+ <item>REVERSE</item>
<item>SHA1</item>
<item>SHA224</item>
<item>SHA256</item>
<item>SHA384</item>
+ <item>SHA3_224</item>
+ <item>SHA3_256</item>
+ <item>SHA3_384</item>
+ <item>SHA3_512</item>
<item>SHA512</item>
- <item>SHARED</item>
- <item>SHOW_PROGRESS</item>
- <item>SORT</item>
- <item>SOURCE</item>
- <item>SOURCES</item>
- <item>START</item>
- <item>STATIC</item>
- <item>STATUS</item>
- <item>STREQUAL</item>
- <item>STRGREATER</item>
- <item>STOP_TIME</item>
- <item>STRIDE</item>
- <item>STRINGS</item>
<item>STRIP</item>
- <item>STRLESS</item>
<item>SUBSTRING</item>
- <item>SYSTEM</item>
- <item>TARGET</item>
- <item>TARGETS</item>
- <item>TEST</item>
- <item>TEST_VARIABLE</item>
- <item>TIMEOUT</item>
<item>TIMESTAMP</item>
- <item>TLS_CAINFO</item>
- <item>TLS_VERIFY</item>
<item>TOLOWER</item>
<item>TOUPPER</item>
- <item>TO_CMAKE_PATH</item>
- <item>TO_NATIVE_PATH</item>
- <item>TRACK</item>
<item>TYPE</item>
- <item>UNIX</item>
- <item>UNIX_COMMAND</item>
- <item>UNKNOWN</item>
- <item>UPLOAD</item>
<item>UPPER</item>
- <item>USES_TERMINAL</item>
- <item>USE_SOURCE_PERMISSIONS</item>
<item>UTC</item>
<item>UUID</item>
- <item>VALUE</item>
- <item>VARIABLE</item>
- <item>VERBATIM</item>
- <item>VERSION</item>
+ </list>
+ <list name="unset_nargs">
+ <item>CACHE</item>
+ <item>PARENT_SCOPE</item>
+ </list>
+ <list name="while_nargs">
+ <item>AND</item>
+ <item>DEFINED</item>
+ <item>EQUAL</item>
+ <item>EXISTS</item>
+ <item>GREATER</item>
+ <item>GREATER_EQUAL</item>
+ <item>IN_LIST</item>
+ <item>IS_ABSOLUTE</item>
+ <item>IS_DIRECTORY</item>
+ <item>IS_NEWER_THAN</item>
+ <item>IS_SYMLINK</item>
+ <item>LESS</item>
+ <item>LESS_EQUAL</item>
+ <item>MATCHES</item>
+ <item>NOT</item>
+ <item>OR</item>
+ <item>POLICY</item>
+ <item>STREQUAL</item>
+ <item>STRGREATER</item>
+ <item>STRGREATER_EQUAL</item>
+ <item>STRLESS</item>
+ <item>STRLESS_EQUAL</item>
+ <item>TARGET</item>
+ <item>TEST</item>
<item>VERSION_EQUAL</item>
<item>VERSION_GREATER</item>
+ <item>VERSION_GREATER_EQUAL</item>
<item>VERSION_LESS</item>
- <item>WARNING</item>
- <item>WIN32</item>
- <item>WINDOWS_COMMAND</item>
- <item>WORKING_DIRECTORY</item>
- <item>WRITE</item>
+ <item>VERSION_LESS_EQUAL</item>
</list>
-
- <!-- these are "special" and don't show up in the generated lists -->
- <list name="extra_special_args">
- <!-- get_filename_component() has <COMP> placeholder for the following special args -->
- <item>PATH</item>
- <item>NAME</item>
- <item>EXT</item>
- <item>NAME_WE</item>
- <item>ABSOLUTE</item>
- <item>REALPATH</item>
- <!-- set() has <type> placeholder for the following special args -->
- <item>FILEPATH</item>
- <!-- PATH already present above -->
- <item>STRING</item>
- <item>BOOL</item>
- <item>INTERNAL</item>
- <!-- key values to the QUERY parameter of cmake_host_system_information() -->
- <item>NUMBER_OF_LOGICAL_CORES</item>
- <item>NUMBER_OF_PHYSICAL_CORES</item>
- <item>HOSTNAME</item>
- <item>FQDN</item>
- <item>TOTAL_VIRTUAL_MEMORY</item>
- <item>AVAILABLE_VIRTUAL_MEMORY</item>
- <item>TOTAL_PHYSICAL_MEMORY</item>
- <item>AVAILABLE_PHYSICAL_MEMORY</item>
- <!-- Since CMake 3.3 -->
- <item>IN_LIST</item>
+ <list name="add_custom_command_nargs">
+ <item>APPEND</item>
+ <item>ARGS</item>
+ <item>BYPRODUCTS</item>
+ <item>COMMAND</item>
+ <item>COMMAND_EXPAND_LISTS</item>
+ <item>COMMENT</item>
+ <item>DEPENDS</item>
+ <item>DEPFILE</item>
+ <item>IMPLICIT_DEPENDS</item>
+ <item>MAIN_DEPENDENCY</item>
+ <item>OUTPUT</item>
+ <item>POST_BUILD</item>
+ <item>PRE_BUILD</item>
+ <item>PRE_LINK</item>
+ <item>TARGET</item>
+ <item>USES_TERMINAL</item>
+ <item>VERBATIM</item>
+ <item>WORKING_DIRECTORY</item>
</list>
-
- <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
- <list name="properties">
- <!-- generated list -->
- <item>ABSTRACT</item>
- <item>ADDITIONAL_MAKE_CLEAN_FILES</item>
- <item>ADVANCED</item>
- <item>ALIASED_TARGET</item>
- <item>ALLOW_DUPLICATE_CUSTOM_TARGETS</item>
- <item>ANDROID_API</item>
- <item>ANDROID_API_MIN</item>
- <item>ANDROID_GUI</item>
- <item>ARCHIVE_OUTPUT_DIRECTORY</item>
- <item>ARCHIVE_OUTPUT_NAME</item>
- <item>ATTACHED_FILES</item>
- <item>ATTACHED_FILES_ON_FAIL</item>
- <item>AUTOGEN_TARGETS_FOLDER</item>
- <item>AUTOGEN_TARGET_DEPENDS</item>
- <item>AUTOMOC</item>
- <item>AUTOMOC_MOC_OPTIONS</item>
- <item>AUTOMOC_TARGETS_FOLDER</item>
- <item>AUTORCC</item>
- <item>AUTORCC_OPTIONS</item>
- <item>AUTOUIC</item>
- <item>AUTOUIC_OPTIONS</item>
- <item>BUILD_WITH_INSTALL_RPATH</item>
- <item>BUNDLE</item>
- <item>BUNDLE_EXTENSION</item>
- <item>CACHE_VARIABLES</item>
- <item>CLEAN_NO_CUSTOM</item>
- <item>CMAKE_CONFIGURE_DEPENDS</item>
- <item>CMAKE_CXX_KNOWN_FEATURES</item>
- <item>CMAKE_C_KNOWN_FEATURES</item>
- <item>COMPATIBLE_INTERFACE_BOOL</item>
- <item>COMPATIBLE_INTERFACE_NUMBER_MAX</item>
- <item>COMPATIBLE_INTERFACE_NUMBER_MIN</item>
- <item>COMPATIBLE_INTERFACE_STRING</item>
- <item>COMPILE_DEFINITIONS</item>
- <item>COMPILE_FEATURES</item>
- <item>COMPILE_FLAGS</item>
- <item>COMPILE_OPTIONS</item>
- <item>COMPILE_PDB_NAME</item>
- <item>COMPILE_PDB_OUTPUT_DIRECTORY</item>
- <item>COST</item>
- <item>CPACK_DESKTOP_SHORTCUTS</item>
- <item>CPACK_NEVER_OVERWRITE</item>
- <item>CPACK_PERMANENT</item>
- <item>CPACK_STARTUP_SHORTCUTS</item>
- <item>CPACK_START_MENU_SHORTCUTS</item>
- <item>CPACK_WIX_ACL</item>
- <item>CROSSCOMPILING_EMULATOR</item>
- <item>CXX_EXTENSIONS</item>
- <item>CXX_STANDARD</item>
- <item>CXX_STANDARD_REQUIRED</item>
- <item>C_EXTENSIONS</item>
- <item>C_STANDARD</item>
- <item>C_STANDARD_REQUIRED</item>
- <item>DEBUG_CONFIGURATIONS</item>
- <item>DEBUG_POSTFIX</item>
- <item>DEFINE_SYMBOL</item>
- <item>DEFINITIONS</item>
+ <list name="add_custom_target_nargs">
+ <item>ALL</item>
+ <item>APPEND</item>
+ <item>BYPRODUCTS</item>
+ <item>COMMAND</item>
+ <item>COMMAND_EXPAND_LISTS</item>
+ <item>COMMENT</item>
<item>DEPENDS</item>
- <item>DISABLED_FEATURES</item>
- <item>ECLIPSE_EXTRA_NATURES</item>
- <item>ENABLED_FEATURES</item>
- <item>ENABLED_LANGUAGES</item>
- <item>ENABLE_EXPORTS</item>
- <item>ENVIRONMENT</item>
+ <item>DEPFILE</item>
+ <item>IMPLICIT_DEPENDS</item>
+ <item>SOURCES</item>
+ <item>USES_TERMINAL</item>
+ <item>VERBATIM</item>
+ <item>WORKING_DIRECTORY</item>
+ </list>
+ <list name="add_executable_nargs">
+ <item>ALIAS</item>
<item>EXCLUDE_FROM_ALL</item>
- <item>EXCLUDE_FROM_DEFAULT_BUILD</item>
- <item>EXPORT_NAME</item>
- <item>EXTERNAL_OBJECT</item>
- <item>EchoString</item>
- <item>FAIL_REGULAR_EXPRESSION</item>
- <item>FIND_LIBRARY_USE_LIB64_PATHS</item>
- <item>FIND_LIBRARY_USE_OPENBSD_VERSIONING</item>
- <item>FOLDER</item>
- <item>FRAMEWORK</item>
- <item>Fortran_FORMAT</item>
- <item>Fortran_MODULE_DIRECTORY</item>
- <item>GENERATED</item>
- <item>GENERATOR_FILE_NAME</item>
- <item>GLOBAL_DEPENDS_DEBUG_MODE</item>
- <item>GLOBAL_DEPENDS_NO_CYCLES</item>
- <item>GNUtoMS</item>
- <item>HAS_CXX</item>
- <item>HEADER_FILE_ONLY</item>
- <item>HELPSTRING</item>
- <item>IMPLICIT_DEPENDS_INCLUDE_TRANSFORM</item>
+ <item>GLOBAL</item>
<item>IMPORTED</item>
- <item>IMPORTED_CONFIGURATIONS</item>
- <item>IMPORTED_IMPLIB</item>
- <item>IMPORTED_LINK_DEPENDENT_LIBRARIES</item>
- <item>IMPORTED_LINK_INTERFACE_LANGUAGES</item>
- <item>IMPORTED_LINK_INTERFACE_LIBRARIES</item>
- <item>IMPORTED_LINK_INTERFACE_MULTIPLICITY</item>
- <item>IMPORTED_LOCATION</item>
- <item>IMPORTED_NO_SONAME</item>
- <item>IMPORTED_SONAME</item>
- <item>IMPORT_PREFIX</item>
- <item>IMPORT_SUFFIX</item>
- <item>INCLUDE_DIRECTORIES</item>
- <item>INCLUDE_REGULAR_EXPRESSION</item>
- <item>INSTALL_NAME_DIR</item>
- <item>INSTALL_RPATH</item>
- <item>INSTALL_RPATH_USE_LINK_PATH</item>
- <item>INTERFACE_AUTOUIC_OPTIONS</item>
- <item>INTERFACE_COMPILE_DEFINITIONS</item>
- <item>INTERFACE_COMPILE_FEATURES</item>
- <item>INTERFACE_COMPILE_OPTIONS</item>
- <item>INTERFACE_INCLUDE_DIRECTORIES</item>
- <item>INTERFACE_LINK_LIBRARIES</item>
- <item>INTERFACE_POSITION_INDEPENDENT_CODE</item>
- <item>INTERFACE_SOURCES</item>
- <item>INTERFACE_SYSTEM_INCLUDE_DIRECTORIES</item>
- <item>INTERPROCEDURAL_OPTIMIZATION</item>
- <item>IN_TRY_COMPILE</item>
- <item>JOB_POOLS</item>
- <item>JOB_POOL_COMPILE</item>
- <item>JOB_POOL_LINK</item>
- <item>KEEP_EXTENSION</item>
- <item>LABELS</item>
- <item>LANGUAGE</item>
- <item>LIBRARY_OUTPUT_DIRECTORY</item>
- <item>LIBRARY_OUTPUT_NAME</item>
- <item>LINKER_LANGUAGE</item>
- <item>LINK_DEPENDS</item>
- <item>LINK_DEPENDS_NO_SHARED</item>
- <item>LINK_DIRECTORIES</item>
- <item>LINK_FLAGS</item>
- <item>LINK_INTERFACE_LIBRARIES</item>
- <item>LINK_INTERFACE_MULTIPLICITY</item>
- <item>LINK_LIBRARIES</item>
- <item>LINK_SEARCH_END_STATIC</item>
- <item>LINK_SEARCH_START_STATIC</item>
- <item>LISTFILE_STACK</item>
- <item>LOCATION</item>
<item>MACOSX_BUNDLE</item>
- <item>MACOSX_BUNDLE_INFO_PLIST</item>
- <item>MACOSX_FRAMEWORK_INFO_PLIST</item>
- <item>MACOSX_PACKAGE_LOCATION</item>
- <item>MACOSX_RPATH</item>
- <item>MACROS</item>
- <item>MEASUREMENT</item>
- <item>MODIFIED</item>
+ <item>WIN32</item>
+ </list>
+ <list name="add_library_nargs">
+ <item>ALIAS</item>
+ <item>EXCLUDE_FROM_ALL</item>
+ <item>GLOBAL</item>
+ <item>IMPORTED</item>
+ <item>INTERFACE</item>
+ <item>MODULE</item>
+ <item>OBJECT</item>
+ <item>SHARED</item>
+ <item>STATIC</item>
+ <item>UNKNOWN</item>
+ </list>
+ <list name="add_subdirectory_nargs">
+ <item>EXCLUDE_FROM_ALL</item>
+ </list>
+ <list name="add_test_nargs">
+ <item>COMMAND</item>
+ <item>CONFIGURATIONS</item>
<item>NAME</item>
- <item>NO_SONAME</item>
- <item>NO_SYSTEM_FROM_IMPORTED</item>
- <item>OBJECT_DEPENDS</item>
- <item>OBJECT_OUTPUTS</item>
- <item>OSX_ARCHITECTURES</item>
- <item>OUTPUT_NAME</item>
- <item>PACKAGES_FOUND</item>
- <item>PACKAGES_NOT_FOUND</item>
- <item>PARENT_DIRECTORY</item>
- <item>PASS_REGULAR_EXPRESSION</item>
- <item>PDB_NAME</item>
- <item>PDB_OUTPUT_DIRECTORY</item>
- <item>POSITION_INDEPENDENT_CODE</item>
- <item>POST_INSTALL_SCRIPT</item>
- <item>PREDEFINED_TARGETS_FOLDER</item>
- <item>PREFIX</item>
- <item>PRE_INSTALL_SCRIPT</item>
+ <item>WORKING_DIRECTORY</item>
+ </list>
+ <list name="build_command_nargs">
+ <item>CONFIGURATION</item>
+ <item>TARGET</item>
+ </list>
+ <list name="create_test_sourcelist_nargs">
+ <item>EXTRA_INCLUDE</item>
+ <item>FUNCTION</item>
+ </list>
+ <list name="define_property_nargs">
+ <item>BRIEF_DOCS</item>
+ <item>CACHED_VARIABLE</item>
+ <item>DIRECTORY</item>
+ <item>FULL_DOCS</item>
+ <item>GLOBAL</item>
+ <item>INHERITED</item>
+ <item>PROPERTY</item>
+ <item>SOURCE</item>
+ <item>TEST</item>
+ <item>VARIABLE</item>
+ </list>
+ <list name="enable_language_nargs">
+ <item>OPTIONAL</item>
+ </list>
+ <list name="enable_language_sargs">
+ <item>C</item>
+ <item>CXX</item>
+ <item>Fortran</item>
+ <item>RC</item>
+ </list>
+ <list name="export_nargs">
+ <item>ANDROID_MK</item>
+ <item>APPEND</item>
+ <item>EXPORT</item>
+ <item>EXPORT_LINK_INTERFACE_LIBRARIES</item>
+ <item>FILE</item>
+ <item>NAMESPACE</item>
+ <item>TARGETS</item>
+ </list>
+ <list name="include_directories_nargs">
+ <item>AFTER</item>
+ <item>BEFORE</item>
+ <item>SYSTEM</item>
+ </list>
+ <list name="include_external_msproject_nargs">
+ <item>GUID</item>
+ <item>PLATFORM</item>
+ <item>TYPE</item>
+ </list>
+ <list name="install_nargs">
+ <item>ARCHIVE</item>
+ <item>BUNDLE</item>
+ <item>CODE</item>
+ <item>COMPONENT</item>
+ <item>CONFIGURATIONS</item>
+ <item>DESTINATION</item>
+ <item>DIRECTORY</item>
+ <item>DIRECTORY_PERMISSIONS</item>
+ <item>EXCLUDE</item>
+ <item>EXCLUDE_FROM_ALL</item>
+ <item>EXPORT</item>
+ <item>EXPORT_ANDROID_MK</item>
+ <item>EXPORT_LINK_INTERFACE_LIBRARIES</item>
+ <item>FILE</item>
+ <item>FILES</item>
+ <item>FILES_MATCHING</item>
+ <item>FILE_PERMISSIONS</item>
+ <item>FRAMEWORK</item>
+ <item>INCLUDES</item>
+ <item>LIBRARY</item>
+ <item>MESSAGE_NEVER</item>
+ <item>NAMELINK_COMPONENT</item>
+ <item>NAMELINK_ONLY</item>
+ <item>NAMELINK_SKIP</item>
+ <item>NAMESPACE</item>
+ <item>OBJECTS</item>
+ <item>OPTIONAL</item>
+ <item>PATTERN</item>
+ <item>PERMISSIONS</item>
<item>PRIVATE_HEADER</item>
- <item>PROCESSORS</item>
- <item>PROJECT_LABEL</item>
+ <item>PROGRAMS</item>
<item>PUBLIC_HEADER</item>
- <item>REPORT_UNDEFINED_PROPERTIES</item>
- <item>REQUIRED_FILES</item>
+ <item>REGEX</item>
+ <item>RENAME</item>
<item>RESOURCE</item>
- <item>RESOURCE_LOCK</item>
- <item>RULE_LAUNCH_COMPILE</item>
- <item>RULE_LAUNCH_CUSTOM</item>
- <item>RULE_LAUNCH_LINK</item>
- <item>RULE_MESSAGES</item>
- <item>RUNTIME_OUTPUT_DIRECTORY</item>
- <item>RUNTIME_OUTPUT_NAME</item>
- <item>RUN_SERIAL</item>
- <item>SKIP_BUILD_RPATH</item>
- <item>SKIP_RETURN_CODE</item>
- <item>SOURCES</item>
- <item>SOVERSION</item>
- <item>STATIC_LIBRARY_FLAGS</item>
- <item>STRINGS</item>
- <item>SUFFIX</item>
- <item>SYMBOLIC</item>
- <item>TARGET_ARCHIVES_MAY_BE_SHARED_LIBS</item>
- <item>TARGET_SUPPORTS_SHARED_LIBS</item>
- <item>TEST_INCLUDE_FILE</item>
- <item>TIMEOUT</item>
- <item>TYPE</item>
- <item>USE_FOLDERS</item>
- <item>VALUE</item>
- <item>VARIABLES</item>
+ <item>RUNTIME</item>
+ <item>SCRIPT</item>
+ <item>TARGETS</item>
+ <item>USE_SOURCE_PERMISSIONS</item>
+ </list>
+ <list name="install_sargs">
+ <item>GROUP_EXECUTE</item>
+ <item>GROUP_READ</item>
+ <item>GROUP_WRITE</item>
+ <item>OWNER_EXECUTE</item>
+ <item>OWNER_READ</item>
+ <item>OWNER_WRITE</item>
+ <item>SETGID</item>
+ <item>SETUID</item>
+ <item>WORLD_EXECUTE</item>
+ <item>WORLD_READ</item>
+ <item>WORLD_WRITE</item>
+ </list>
+ <list name="link_libraries_nargs">
+ <item>debug</item>
+ <item>general</item>
+ <item>optimized</item>
+ </list>
+ <list name="load_cache_nargs">
+ <item>EXCLUDE</item>
+ <item>INCLUDE_INTERNALS</item>
+ <item>READ_WITH_PREFIX</item>
+ </list>
+ <list name="project_nargs">
+ <item>DESCRIPTION</item>
+ <item>HOMEPAGE_URL</item>
+ <item>LANGUAGES</item>
<item>VERSION</item>
- <item>VISIBILITY_INLINES_HIDDEN</item>
- <item>VS_DEPLOYMENT_CONTENT</item>
- <item>VS_DEPLOYMENT_LOCATION</item>
- <item>VS_DOTNET_REFERENCES</item>
- <item>VS_DOTNET_TARGET_FRAMEWORK_VERSION</item>
- <item>VS_GLOBAL_KEYWORD</item>
- <item>VS_GLOBAL_PROJECT_TYPES</item>
- <item>VS_GLOBAL_ROOTNAMESPACE</item>
- <item>VS_KEYWORD</item>
- <item>VS_SCC_AUXPATH</item>
- <item>VS_SCC_LOCALPATH</item>
- <item>VS_SCC_PROJECTNAME</item>
- <item>VS_SCC_PROVIDER</item>
- <item>VS_SHADER_ENTRYPOINT</item>
- <item>VS_SHADER_FLAGS</item>
- <item>VS_SHADER_MODEL</item>
- <item>VS_SHADER_TYPE</item>
- <item>VS_WINRT_COMPONENT</item>
- <item>VS_WINRT_EXTENSIONS</item>
- <item>VS_WINRT_REFERENCES</item>
- <item>VS_XAML_TYPE</item>
- <item>WILL_FAIL</item>
- <item>WIN32_EXECUTABLE</item>
- <item>WORKING_DIRECTORY</item>
- <item>WRAP_EXCLUDE</item>
- <item>XCODE_EXPLICIT_FILE_TYPE</item>
- <item>XCODE_LAST_KNOWN_FILE_TYPE</item>
- <item>XCTEST</item>
</list>
-
- <!-- these are "special" and don't show up in the generated lists -->
- <list name="extra_properties">
- <item>COMMANDS</item> <!-- WARNING: this one looks like a cmake bug, watch for it to migrate to the generated list! -->
- <item>DEFINITION</item>
+ <list name="project_sargs">
+ <item>ASM</item>
+ <item>C</item>
+ <item>CUDA</item>
+ <item>CXX</item>
+ <item>Fortran</item>
+ <item>NONE</item>
+ <item>RC</item>
+ </list>
+ <list name="set_source_files_properties_nargs">
+ <item>PROPERTIES</item>
+ </list>
+ <list name="set_target_properties_nargs">
+ <item>PROPERTIES</item>
+ </list>
+ <list name="set_tests_properties_nargs">
+ <item>PROPERTIES</item>
+ </list>
+ <list name="source_group_nargs">
+ <item>FILES</item>
+ <item>PREFIX</item>
+ <item>REGULAR_EXPRESSION</item>
+ <item>TREE</item>
+ </list>
+ <list name="target_compile_definitions_nargs">
+ <item>INTERFACE</item>
+ <item>PRIVATE</item>
+ <item>PUBLIC</item>
+ </list>
+ <list name="target_compile_features_nargs">
+ <item>INTERFACE</item>
+ <item>PRIVATE</item>
+ <item>PUBLIC</item>
+ </list>
+ <list name="target_compile_features_sargs">
+ <item>c_function_prototypes</item>
+ <item>c_restrict</item>
+ <item>c_static_assert</item>
+ <item>c_std_11</item>
+ <item>c_std_90</item>
+ <item>c_std_99</item>
+ <item>c_variadic_macros</item>
+ <item>cxx_aggregate_default_initializers</item>
+ <item>cxx_alias_templates</item>
+ <item>cxx_alignas</item>
+ <item>cxx_alignof</item>
+ <item>cxx_attribute_deprecated</item>
+ <item>cxx_attributes</item>
+ <item>cxx_auto_type</item>
+ <item>cxx_binary_literals</item>
+ <item>cxx_constexpr</item>
+ <item>cxx_contextual_conversions</item>
+ <item>cxx_decltype</item>
+ <item>cxx_decltype_auto</item>
+ <item>cxx_decltype_incomplete_return_types</item>
+ <item>cxx_default_function_template_args</item>
+ <item>cxx_defaulted_functions</item>
+ <item>cxx_defaulted_move_initializers</item>
+ <item>cxx_delegating_constructors</item>
+ <item>cxx_deleted_functions</item>
+ <item>cxx_digit_separators</item>
+ <item>cxx_enum_forward_declarations</item>
+ <item>cxx_explicit_conversions</item>
+ <item>cxx_extended_friend_declarations</item>
+ <item>cxx_extern_templates</item>
+ <item>cxx_final</item>
+ <item>cxx_func_identifier</item>
+ <item>cxx_generalized_initializers</item>
+ <item>cxx_generic_lambdas</item>
+ <item>cxx_inheriting_constructors</item>
+ <item>cxx_inline_namespaces</item>
+ <item>cxx_lambda_init_captures</item>
+ <item>cxx_lambdas</item>
+ <item>cxx_local_type_template_args</item>
+ <item>cxx_long_long_type</item>
+ <item>cxx_noexcept</item>
+ <item>cxx_nonstatic_member_init</item>
+ <item>cxx_nullptr</item>
+ <item>cxx_override</item>
+ <item>cxx_range_for</item>
+ <item>cxx_raw_string_literals</item>
+ <item>cxx_reference_qualified_functions</item>
+ <item>cxx_relaxed_constexpr</item>
+ <item>cxx_return_type_deduction</item>
+ <item>cxx_right_angle_brackets</item>
+ <item>cxx_rvalue_references</item>
+ <item>cxx_sizeof_member</item>
+ <item>cxx_static_assert</item>
+ <item>cxx_std_11</item>
+ <item>cxx_std_14</item>
+ <item>cxx_std_17</item>
+ <item>cxx_std_20</item>
+ <item>cxx_std_98</item>
+ <item>cxx_strong_enums</item>
+ <item>cxx_template_template_parameters</item>
+ <item>cxx_thread_local</item>
+ <item>cxx_trailing_return_types</item>
+ <item>cxx_unicode_literals</item>
+ <item>cxx_uniform_initialization</item>
+ <item>cxx_unrestricted_unions</item>
+ <item>cxx_user_literals</item>
+ <item>cxx_variable_templates</item>
+ <item>cxx_variadic_macros</item>
+ <item>cxx_variadic_templates</item>
+ </list>
+ <list name="target_compile_options_nargs">
+ <item>BEFORE</item>
+ <item>INTERFACE</item>
+ <item>PRIVATE</item>
+ <item>PUBLIC</item>
+ </list>
+ <list name="target_include_directories_nargs">
+ <item>BEFORE</item>
+ <item>INTERFACE</item>
+ <item>PRIVATE</item>
+ <item>PUBLIC</item>
+ <item>SYSTEM</item>
+ </list>
+ <list name="target_link_libraries_nargs">
+ <item>INTERFACE</item>
+ <item>PRIVATE</item>
+ <item>PUBLIC</item>
+ </list>
+ <list name="target_sources_nargs">
+ <item>INTERFACE</item>
+ <item>PRIVATE</item>
+ <item>PUBLIC</item>
+ </list>
+ <list name="try_compile_nargs">
+ <item>CMAKE_FLAGS</item>
+ <item>COMPILE_DEFINITIONS</item>
+ <item>COPY_FILE</item>
+ <item>COPY_FILE_ERROR</item>
+ <item>LINK_LIBRARIES</item>
+ <item>OUTPUT_VARIABLE</item>
+ <item>RESULT_VAR</item>
+ <item>SOURCES</item>
+ </list>
+ <list name="try_run_nargs">
+ <item>ARGS</item>
+ <item>CMAKE_FLAGS</item>
+ <item>COMPILE_DEFINITIONS</item>
+ <item>COMPILE_OUTPUT_VARIABLE</item>
+ <item>COMPILE_RESULT_VAR</item>
+ <item>LINK_LIBRARIES</item>
+ <item>OUTPUT_VARIABLE</item>
+ <item>RUN_OUTPUT_VARIABLE</item>
+ <item>RUN_RESULT_VAR</item>
+ </list>
+ <list name="ctest_build_nargs">
+ <item>APPEND</item>
+ <item>BUILD</item>
+ <item>CAPTURE_CMAKE_ERROR</item>
+ <item>CONFIGURATION</item>
+ <item>FLAGS</item>
+ <item>NUMBER_ERRORS</item>
+ <item>NUMBER_WARNINGS</item>
+ <item>PROJECT_NAME</item>
+ <item>RETURN_VALUE</item>
+ <item>TARGET</item>
+ </list>
+ <list name="ctest_configure_nargs">
+ <item>APPEND</item>
+ <item>BUILD</item>
+ <item>CAPTURE_CMAKE_ERROR</item>
+ <item>OPTIONS</item>
+ <item>QUIET</item>
+ <item>RETURN_VALUE</item>
+ <item>SOURCE</item>
+ </list>
+ <list name="ctest_coverage_nargs">
+ <item>APPEND</item>
+ <item>BUILD</item>
+ <item>CAPTURE_CMAKE_ERROR</item>
+ <item>LABELS</item>
+ <item>QUIET</item>
+ <item>RETURN_VALUE</item>
+ </list>
+ <list name="ctest_memcheck_nargs">
+ <item>APPEND</item>
+ <item>BUILD</item>
+ <item>DEFECT_COUNT</item>
+ <item>END</item>
+ <item>EXCLUDE</item>
+ <item>EXCLUDE_FIXTURE</item>
+ <item>EXCLUDE_FIXTURE_CLEANUP</item>
+ <item>EXCLUDE_FIXTURE_SETUP</item>
+ <item>EXCLUDE_LABEL</item>
+ <item>INCLUDE</item>
+ <item>INCLUDE_LABEL</item>
+ <item>PARALLEL_LEVEL</item>
+ <item>QUIET</item>
+ <item>RETURN_VALUE</item>
+ <item>SCHEDULE_RANDOM</item>
+ <item>START</item>
+ <item>STOP_TIME</item>
+ <item>STRIDE</item>
+ <item>TEST_LOAD</item>
+ </list>
+ <list name="ctest_run_script_nargs">
+ <item>NEW_PROCESS</item>
+ <item>RETURN_VALUE</item>
+ </list>
+ <list name="ctest_start_nargs">
+ <item>APPEND</item>
+ <item>QUIET</item>
+ <item>TRACK</item>
+ </list>
+ <list name="ctest_submit_nargs">
+ <item>CDASH_UPLOAD</item>
+ <item>CDASH_UPLOAD_TYPE</item>
+ <item>FILES</item>
+ <item>HTTPHEADER</item>
+ <item>PARTS</item>
+ <item>QUIET</item>
+ <item>RETRY_COUNT</item>
+ <item>RETRY_DELAY</item>
+ <item>RETURN_VALUE</item>
+ </list>
+ <list name="ctest_test_nargs">
+ <item>APPEND</item>
+ <item>BUILD</item>
+ <item>CAPTURE_CMAKE_ERROR</item>
+ <item>END</item>
+ <item>EXCLUDE</item>
+ <item>EXCLUDE_FIXTURE</item>
+ <item>EXCLUDE_FIXTURE_CLEANUP</item>
+ <item>EXCLUDE_FIXTURE_SETUP</item>
+ <item>EXCLUDE_LABEL</item>
+ <item>INCLUDE</item>
+ <item>INCLUDE_LABEL</item>
+ <item>PARALLEL_LEVEL</item>
+ <item>QUIET</item>
+ <item>RETURN_VALUE</item>
+ <item>SCHEDULE_RANDOM</item>
+ <item>START</item>
+ <item>STOP_TIME</item>
+ <item>STRIDE</item>
+ <item>TEST_LOAD</item>
+ </list>
+ <list name="ctest_update_nargs">
+ <item>QUIET</item>
+ <item>RETURN_VALUE</item>
+ <item>SOURCE</item>
+ </list>
+ <list name="ctest_upload_nargs">
+ <item>CAPTURE_CMAKE_ERROR</item>
+ <item>FILES</item>
+ <item>QUIET</item>
</list>
- <!-- ATTENTION Do not change the list name! Or change a generation script accordingly -->
- <list name="cmake_vars">
- <!-- generated list -->
+ <list name="variables">
+ <item>ANDROID</item>
<item>APPLE</item>
<item>BORLAND</item>
<item>BUILD_SHARED_LIBS</item>
+ <item>BUILD_TESTING</item>
<item>CMAKE_ABSOLUTE_DESTINATION_FILES</item>
+ <item>CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS</item>
<item>CMAKE_ANDROID_API</item>
<item>CMAKE_ANDROID_API_MIN</item>
+ <item>CMAKE_ANDROID_ARCH</item>
+ <item>CMAKE_ANDROID_ARCH_ABI</item>
+ <item>CMAKE_ANDROID_ARM_MODE</item>
+ <item>CMAKE_ANDROID_ARM_NEON</item>
+ <item>CMAKE_ANDROID_ASSETS_DIRECTORIES</item>
<item>CMAKE_ANDROID_GUI</item>
+ <item>CMAKE_ANDROID_JAR_DEPENDENCIES</item>
+ <item>CMAKE_ANDROID_JAR_DIRECTORIES</item>
+ <item>CMAKE_ANDROID_JAVA_SOURCE_DIR</item>
+ <item>CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES</item>
+ <item>CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES</item>
+ <item>CMAKE_ANDROID_NDK</item>
+ <item>CMAKE_ANDROID_NDK_DEPRECATED_HEADERS</item>
+ <item>CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG</item>
+ <item>CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION</item>
+ <item>CMAKE_ANDROID_PROCESS_MAX</item>
+ <item>CMAKE_ANDROID_PROGUARD</item>
+ <item>CMAKE_ANDROID_PROGUARD_CONFIG_PATH</item>
+ <item>CMAKE_ANDROID_SECURE_PROPS_PATH</item>
+ <item>CMAKE_ANDROID_SKIP_ANT_STEP</item>
+ <item>CMAKE_ANDROID_STANDALONE_TOOLCHAIN</item>
+ <item>CMAKE_ANDROID_STL_TYPE</item>
+ <item>CMAKE_ANSI_CXXFLAGS</item>
<item>CMAKE_APPBUNDLE_PATH</item>
<item>CMAKE_AR</item>
<item>CMAKE_ARCHIVE_OUTPUT_DIRECTORY</item>
<item>CMAKE_ARGC</item>
<item>CMAKE_ARGV0</item>
<item>CMAKE_AUTOMOC</item>
+ <item>CMAKE_AUTOMOC_DEPEND_FILTERS</item>
<item>CMAKE_AUTOMOC_MOC_OPTIONS</item>
<item>CMAKE_AUTOMOC_RELAXED_MODE</item>
<item>CMAKE_AUTORCC</item>
<item>CMAKE_AUTORCC_OPTIONS</item>
<item>CMAKE_AUTOUIC</item>
<item>CMAKE_AUTOUIC_OPTIONS</item>
+ <item>CMAKE_AUTOUIC_SEARCH_PATHS</item>
<item>CMAKE_BACKWARDS_COMPATIBILITY</item>
<item>CMAKE_BINARY_DIR</item>
+ <item>CMAKE_BUILD_RPATH</item>
<item>CMAKE_BUILD_TOOL</item>
<item>CMAKE_BUILD_TYPE</item>
+ <item>CMAKE_BUILD_WITH_INSTALL_NAME_DIR</item>
<item>CMAKE_BUILD_WITH_INSTALL_RPATH</item>
<item>CMAKE_CACHEFILE_DIR</item>
<item>CMAKE_CACHE_MAJOR_VERSION</item>
@@ -782,14 +1197,25 @@
<item>CMAKE_CACHE_PATCH_VERSION</item>
<item>CMAKE_CFG_INTDIR</item>
<item>CMAKE_CL_64</item>
+ <item>CMAKE_CODEBLOCKS_COMPILER_ID</item>
+ <item>CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES</item>
+ <item>CMAKE_CODELITE_USE_TARGETS</item>
<item>CMAKE_COLOR_MAKEFILE</item>
<item>CMAKE_COMMAND</item>
<item>CMAKE_COMPILER_2005</item>
+ <item>CMAKE_COMPILER_IS_GNUCC</item>
+ <item>CMAKE_COMPILER_IS_GNUCXX</item>
+ <item>CMAKE_COMPILER_IS_GNUG77</item>
<item>CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY</item>
<item>CMAKE_CONFIGURATION_TYPES</item>
<item>CMAKE_CROSSCOMPILING</item>
<item>CMAKE_CROSSCOMPILING_EMULATOR</item>
<item>CMAKE_CTEST_COMMAND</item>
+ <item>CMAKE_CUDA_EXTENSIONS</item>
+ <item>CMAKE_CUDA_SEPARABLE_COMPILATION</item>
+ <item>CMAKE_CUDA_STANDARD</item>
+ <item>CMAKE_CUDA_STANDARD_REQUIRED</item>
+ <item>CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES</item>
<item>CMAKE_CURRENT_BINARY_DIR</item>
<item>CMAKE_CURRENT_LIST_DIR</item>
<item>CMAKE_CURRENT_LIST_FILE</item>
@@ -805,27 +1231,45 @@
<item>CMAKE_C_STANDARD_REQUIRED</item>
<item>CMAKE_DEBUG_POSTFIX</item>
<item>CMAKE_DEBUG_TARGET_PROPERTIES</item>
+ <item>CMAKE_DEPENDS_IN_PROJECT_ONLY</item>
+ <item>CMAKE_DIRECTORY_LABELS</item>
<item>CMAKE_DL_LIBS</item>
+ <item>CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION</item>
+ <item>CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES</item>
+ <item>CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT</item>
+ <item>CMAKE_ECLIPSE_MAKE_ARGUMENTS</item>
+ <item>CMAKE_ECLIPSE_VERSION</item>
<item>CMAKE_EDIT_COMMAND</item>
+ <item>CMAKE_ENABLE_EXPORTS</item>
<item>CMAKE_ERROR_DEPRECATED</item>
<item>CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</item>
<item>CMAKE_EXECUTABLE_SUFFIX</item>
<item>CMAKE_EXE_LINKER_FLAGS</item>
+ <item>CMAKE_EXE_LINKER_FLAGS_INIT</item>
+ <item>CMAKE_EXPORT_COMPILE_COMMANDS</item>
<item>CMAKE_EXPORT_NO_PACKAGE_REGISTRY</item>
<item>CMAKE_EXTRA_GENERATOR</item>
+ <item>CMAKE_EXTRA_INCLUDE_FILES</item>
<item>CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES</item>
+ <item>CMAKE_FIND_APPBUNDLE</item>
+ <item>CMAKE_FIND_FRAMEWORK</item>
+ <item>CMAKE_FIND_FRAMEWORK_EXTRA_LOCATIONS</item>
+ <item>CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX</item>
<item>CMAKE_FIND_LIBRARY_PREFIXES</item>
<item>CMAKE_FIND_LIBRARY_SUFFIXES</item>
<item>CMAKE_FIND_NO_INSTALL_PREFIX</item>
<item>CMAKE_FIND_PACKAGE_NAME</item>
<item>CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY</item>
<item>CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY</item>
+ <item>CMAKE_FIND_PACKAGE_SORT_DIRECTION</item>
+ <item>CMAKE_FIND_PACKAGE_SORT_ORDER</item>
<item>CMAKE_FIND_PACKAGE_WARN_NO_MODULE</item>
<item>CMAKE_FIND_ROOT_PATH</item>
<item>CMAKE_FIND_ROOT_PATH_MODE_INCLUDE</item>
<item>CMAKE_FIND_ROOT_PATH_MODE_LIBRARY</item>
<item>CMAKE_FIND_ROOT_PATH_MODE_PACKAGE</item>
<item>CMAKE_FIND_ROOT_PATH_MODE_PROGRAM</item>
+ <item>CMAKE_FOLDER</item>
<item>CMAKE_FRAMEWORK_PATH</item>
<item>CMAKE_Fortran_FORMAT</item>
<item>CMAKE_Fortran_MODDIR_DEFAULT</item>
@@ -833,17 +1277,21 @@
<item>CMAKE_Fortran_MODOUT_FLAG</item>
<item>CMAKE_Fortran_MODULE_DIRECTORY</item>
<item>CMAKE_GENERATOR</item>
+ <item>CMAKE_GENERATOR_INSTANCE</item>
<item>CMAKE_GENERATOR_PLATFORM</item>
<item>CMAKE_GENERATOR_TOOLSET</item>
<item>CMAKE_GNUtoMS</item>
+ <item>CMAKE_HAS_ANSI_STRING_STREAM</item>
<item>CMAKE_HOME_DIRECTORY</item>
<item>CMAKE_HOST_APPLE</item>
+ <item>CMAKE_HOST_SOLARIS</item>
<item>CMAKE_HOST_SYSTEM</item>
<item>CMAKE_HOST_SYSTEM_NAME</item>
<item>CMAKE_HOST_SYSTEM_PROCESSOR</item>
<item>CMAKE_HOST_SYSTEM_VERSION</item>
<item>CMAKE_HOST_UNIX</item>
<item>CMAKE_HOST_WIN32</item>
+ <item>CMAKE_HP_PTHREADS_INIT</item>
<item>CMAKE_IGNORE_PATH</item>
<item>CMAKE_IMPORT_LIBRARY_PREFIX</item>
<item>CMAKE_IMPORT_LIBRARY_SUFFIX</item>
@@ -852,13 +1300,60 @@
<item>CMAKE_INCLUDE_DIRECTORIES_BEFORE</item>
<item>CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE</item>
<item>CMAKE_INCLUDE_PATH</item>
+ <item>CMAKE_INSTALL_BINDIR</item>
+ <item>CMAKE_INSTALL_DATADIR</item>
+ <item>CMAKE_INSTALL_DATAROOTDIR</item>
+ <item>CMAKE_INSTALL_DEBUG_LIBRARIES</item>
+ <item>CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY</item>
<item>CMAKE_INSTALL_DEFAULT_COMPONENT_NAME</item>
+ <item>CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS</item>
+ <item>CMAKE_INSTALL_DOCDIR</item>
+ <item>CMAKE_INSTALL_FULL_BINDIR</item>
+ <item>CMAKE_INSTALL_FULL_DATADIR</item>
+ <item>CMAKE_INSTALL_FULL_DATAROOTDIR</item>
+ <item>CMAKE_INSTALL_FULL_DOCDIR</item>
+ <item>CMAKE_INSTALL_FULL_INCLUDEDIR</item>
+ <item>CMAKE_INSTALL_FULL_INFODIR</item>
+ <item>CMAKE_INSTALL_FULL_LIBDIR</item>
+ <item>CMAKE_INSTALL_FULL_LIBEXECDIR</item>
+ <item>CMAKE_INSTALL_FULL_LOCALEDIR</item>
+ <item>CMAKE_INSTALL_FULL_LOCALSTATEDIR</item>
+ <item>CMAKE_INSTALL_FULL_MANDIR</item>
+ <item>CMAKE_INSTALL_FULL_OLDINCLUDEDIR</item>
+ <item>CMAKE_INSTALL_FULL_RUNSTATEDIR</item>
+ <item>CMAKE_INSTALL_FULL_SBINDIR</item>
+ <item>CMAKE_INSTALL_FULL_SHAREDSTATEDIR</item>
+ <item>CMAKE_INSTALL_FULL_SYSCONFDIR</item>
+ <item>CMAKE_INSTALL_INCLUDEDIR</item>
+ <item>CMAKE_INSTALL_INFODIR</item>
+ <item>CMAKE_INSTALL_LIBDIR</item>
+ <item>CMAKE_INSTALL_LIBEXECDIR</item>
+ <item>CMAKE_INSTALL_LOCALEDIR</item>
+ <item>CMAKE_INSTALL_LOCALSTATEDIR</item>
+ <item>CMAKE_INSTALL_MANDIR</item>
<item>CMAKE_INSTALL_MESSAGE</item>
+ <item>CMAKE_INSTALL_MFC_LIBRARIES</item>
<item>CMAKE_INSTALL_NAME_DIR</item>
+ <item>CMAKE_INSTALL_OLDINCLUDEDIR</item>
+ <item>CMAKE_INSTALL_OPENMP_LIBRARIES</item>
<item>CMAKE_INSTALL_PREFIX</item>
+ <item>CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT</item>
<item>CMAKE_INSTALL_RPATH</item>
<item>CMAKE_INSTALL_RPATH_USE_LINK_PATH</item>
+ <item>CMAKE_INSTALL_RUNSTATEDIR</item>
+ <item>CMAKE_INSTALL_SBINDIR</item>
+ <item>CMAKE_INSTALL_SHAREDSTATEDIR</item>
+ <item>CMAKE_INSTALL_SYSCONFDIR</item>
+ <item>CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT</item>
+ <item>CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION</item>
+ <item>CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS</item>
+ <item>CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS</item>
+ <item>CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP</item>
+ <item>CMAKE_INSTALL_UCRT_LIBRARIES</item>
<item>CMAKE_INTERNAL_PLATFORM_ABI</item>
+ <item>CMAKE_INTERPROCEDURAL_OPTIMIZATION</item>
+ <item>CMAKE_IOS_INSTALL_COMBINED</item>
+ <item>CMAKE_JOB_POOLS</item>
<item>CMAKE_JOB_POOL_COMPILE</item>
<item>CMAKE_JOB_POOL_LINK</item>
<item>CMAKE_LIBRARY_ARCHITECTURE</item>
@@ -872,6 +1367,9 @@
<item>CMAKE_LINK_LIBRARY_FILE_FLAG</item>
<item>CMAKE_LINK_LIBRARY_FLAG</item>
<item>CMAKE_LINK_LIBRARY_SUFFIX</item>
+ <item>CMAKE_LINK_SEARCH_END_STATIC</item>
+ <item>CMAKE_LINK_SEARCH_START_STATIC</item>
+ <item>CMAKE_LINK_WHAT_YOU_USE</item>
<item>CMAKE_MACOSX_BUNDLE</item>
<item>CMAKE_MACOSX_RPATH</item>
<item>CMAKE_MAJOR_VERSION</item>
@@ -881,9 +1379,17 @@
<item>CMAKE_MINIMUM_REQUIRED_VERSION</item>
<item>CMAKE_MINOR_VERSION</item>
<item>CMAKE_MODULE_LINKER_FLAGS</item>
+ <item>CMAKE_MODULE_LINKER_FLAGS_INIT</item>
<item>CMAKE_MODULE_PATH</item>
+ <item>CMAKE_NETRC</item>
+ <item>CMAKE_NETRC_FILE</item>
+ <item>CMAKE_NINJA_OUTPUT_PATH_PREFIX</item>
<item>CMAKE_NOT_USING_CONFIG_FLAGS</item>
+ <item>CMAKE_NO_ANSI_FOR_SCOPE</item>
+ <item>CMAKE_NO_ANSI_STREAM_HEADERS</item>
+ <item>CMAKE_NO_ANSI_STRING_STREAM</item>
<item>CMAKE_NO_BUILTIN_CHRPATH</item>
+ <item>CMAKE_NO_STD_NAMESPACE</item>
<item>CMAKE_NO_SYSTEM_FROM_IMPORTED</item>
<item>CMAKE_OBJECT_PATH_MAX</item>
<item>CMAKE_OSX_ARCHITECTURES</item>
@@ -895,14 +1401,27 @@
<item>CMAKE_POSITION_INDEPENDENT_CODE</item>
<item>CMAKE_PREFIX_PATH</item>
<item>CMAKE_PROGRAM_PATH</item>
+ <item>CMAKE_PROJECT_DESCRIPTION</item>
+ <item>CMAKE_PROJECT_HOMEPAGE_URL</item>
<item>CMAKE_PROJECT_NAME</item>
+ <item>CMAKE_PROJECT_VERSION</item>
+ <item>CMAKE_PROJECT_VERSION_MAJOR</item>
+ <item>CMAKE_PROJECT_VERSION_MINOR</item>
+ <item>CMAKE_PROJECT_VERSION_PATCH</item>
+ <item>CMAKE_PROJECT_VERSION_TWEAK</item>
<item>CMAKE_RANLIB</item>
+ <item>CMAKE_REQUIRED_DEFINITIONS</item>
+ <item>CMAKE_REQUIRED_FLAGS</item>
+ <item>CMAKE_REQUIRED_INCLUDES</item>
+ <item>CMAKE_REQUIRED_LIBRARIES</item>
+ <item>CMAKE_REQUIRED_QUIET</item>
<item>CMAKE_ROOT</item>
<item>CMAKE_RUNTIME_OUTPUT_DIRECTORY</item>
<item>CMAKE_SCRIPT_MODE_FILE</item>
<item>CMAKE_SHARED_LIBRARY_PREFIX</item>
<item>CMAKE_SHARED_LIBRARY_SUFFIX</item>
<item>CMAKE_SHARED_LINKER_FLAGS</item>
+ <item>CMAKE_SHARED_LINKER_FLAGS_INIT</item>
<item>CMAKE_SHARED_MODULE_PREFIX</item>
<item>CMAKE_SHARED_MODULE_SUFFIX</item>
<item>CMAKE_SIZEOF_VOID_P</item>
@@ -913,12 +1432,23 @@
<item>CMAKE_SKIP_RPATH</item>
<item>CMAKE_SOURCE_DIR</item>
<item>CMAKE_STAGING_PREFIX</item>
- <item>CMAKE_STANDARD_LIBRARIES</item>
<item>CMAKE_STATIC_LIBRARY_PREFIX</item>
<item>CMAKE_STATIC_LIBRARY_SUFFIX</item>
<item>CMAKE_STATIC_LINKER_FLAGS</item>
+ <item>CMAKE_STATIC_LINKER_FLAGS_INIT</item>
+ <item>CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS</item>
+ <item>CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE</item>
+ <item>CMAKE_SUPPRESS_DEVELOPER_ERRORS</item>
+ <item>CMAKE_SUPPRESS_DEVELOPER_WARNINGS</item>
+ <item>CMAKE_SUPPRESS_REGENERATION</item>
+ <item>CMAKE_SWIG_FLAGS</item>
+ <item>CMAKE_SWIG_OUTDIR</item>
<item>CMAKE_SYSROOT</item>
+ <item>CMAKE_SYSROOT_COMPILE</item>
+ <item>CMAKE_SYSROOT_LINK</item>
<item>CMAKE_SYSTEM</item>
+ <item>CMAKE_SYSTEM_APPBUNDLE_PATH</item>
+ <item>CMAKE_SYSTEM_FRAMEWORK_PATH</item>
<item>CMAKE_SYSTEM_IGNORE_PATH</item>
<item>CMAKE_SYSTEM_INCLUDE_PATH</item>
<item>CMAKE_SYSTEM_LIBRARY_PATH</item>
@@ -927,45 +1457,345 @@
<item>CMAKE_SYSTEM_PROCESSOR</item>
<item>CMAKE_SYSTEM_PROGRAM_PATH</item>
<item>CMAKE_SYSTEM_VERSION</item>
+ <item>CMAKE_Swift_LANGUAGE_VERSION</item>
+ <item>CMAKE_THREAD_LIBS_INIT</item>
+ <item>CMAKE_THREAD_PREFER_PTHREAD</item>
<item>CMAKE_TOOLCHAIN_FILE</item>
<item>CMAKE_TRY_COMPILE_CONFIGURATION</item>
+ <item>CMAKE_TRY_COMPILE_PLATFORM_VARIABLES</item>
+ <item>CMAKE_TRY_COMPILE_TARGET_TYPE</item>
<item>CMAKE_TWEAK_VERSION</item>
<item>CMAKE_USER_MAKE_RULES_OVERRIDE</item>
+ <item>CMAKE_USE_PTHREADS_INIT</item>
<item>CMAKE_USE_RELATIVE_PATHS</item>
+ <item>CMAKE_USE_SPROC_INIT</item>
+ <item>CMAKE_USE_WIN32_THREADS_INIT</item>
<item>CMAKE_VERBOSE_MAKEFILE</item>
<item>CMAKE_VERSION</item>
<item>CMAKE_VISIBILITY_INLINES_HIDDEN</item>
<item>CMAKE_VS_DEVENV_COMMAND</item>
<item>CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD</item>
+ <item>CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD</item>
<item>CMAKE_VS_INTEL_Fortran_PROJECT_VERSION</item>
<item>CMAKE_VS_MSBUILD_COMMAND</item>
- <item>CMAKE_VS_MSDEV_COMMAND</item>
<item>CMAKE_VS_NsightTegra_VERSION</item>
<item>CMAKE_VS_PLATFORM_NAME</item>
<item>CMAKE_VS_PLATFORM_TOOLSET</item>
+ <item>CMAKE_VS_PLATFORM_TOOLSET_CUDA</item>
+ <item>CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE</item>
+ <item>CMAKE_VS_SDK_EXCLUDE_DIRECTORIES</item>
+ <item>CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES</item>
+ <item>CMAKE_VS_SDK_INCLUDE_DIRECTORIES</item>
+ <item>CMAKE_VS_SDK_LIBRARY_DIRECTORIES</item>
+ <item>CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES</item>
+ <item>CMAKE_VS_SDK_REFERENCE_DIRECTORIES</item>
+ <item>CMAKE_VS_SDK_SOURCE_DIRECTORIES</item>
+ <item>CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION</item>
<item>CMAKE_WARN_DEPRECATED</item>
<item>CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</item>
<item>CMAKE_WIN32_EXECUTABLE</item>
+ <item>CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS</item>
+ <item>CMAKE_XCODE_GENERATE_SCHEME</item>
<item>CMAKE_XCODE_PLATFORM_TOOLSET</item>
<item>CPACK_ABSOLUTE_DESTINATION_FILES</item>
+ <item>CPACK_ARCHIVE_COMPONENT_INSTALL</item>
+ <item>CPACK_ARCHIVE_FILE_NAME</item>
+ <item>CPACK_BUILD_SOURCE_DIRS</item>
+ <item>CPACK_BUNDLE_APPLE_CERT_APP</item>
+ <item>CPACK_BUNDLE_APPLE_CODESIGN_FILES</item>
+ <item>CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER</item>
+ <item>CPACK_BUNDLE_APPLE_ENTITLEMENTS</item>
+ <item>CPACK_BUNDLE_ICON</item>
+ <item>CPACK_BUNDLE_NAME</item>
+ <item>CPACK_BUNDLE_PLIST</item>
+ <item>CPACK_BUNDLE_STARTUP_COMMAND</item>
+ <item>CPACK_CMAKE_GENERATOR</item>
+ <item>CPACK_COMMAND_CODESIGN</item>
+ <item>CPACK_COMMAND_HDIUTIL</item>
+ <item>CPACK_COMMAND_PKGBUILD</item>
+ <item>CPACK_COMMAND_PRODUCTBUILD</item>
+ <item>CPACK_COMMAND_REZ</item>
+ <item>CPACK_COMMAND_SETFILE</item>
+ <item>CPACK_COMPONENTS_ALL</item>
+ <item>CPACK_COMPONENTS_GROUPING</item>
<item>CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY</item>
+ <item>CPACK_CREATE_DESKTOP_LINKS</item>
+ <item>CPACK_CYGWIN_BUILD_SCRIPT</item>
+ <item>CPACK_CYGWIN_PATCH_FILE</item>
+ <item>CPACK_CYGWIN_PATCH_NUMBER</item>
+ <item>CPACK_DEBIAN_ARCHIVE_TYPE</item>
+ <item>CPACK_DEBIAN_COMPRESSION_TYPE</item>
+ <item>CPACK_DEBIAN_ENABLE_COMPONENT_DEPENDS</item>
+ <item>CPACK_DEBIAN_FILE_NAME</item>
+ <item>CPACK_DEBIAN_PACKAGE_ARCHITECTURE</item>
+ <item>CPACK_DEBIAN_PACKAGE_BREAKS</item>
+ <item>CPACK_DEBIAN_PACKAGE_CONFLICTS</item>
+ <item>CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA</item>
+ <item>CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION</item>
+ <item>CPACK_DEBIAN_PACKAGE_DEBUG</item>
+ <item>CPACK_DEBIAN_PACKAGE_DEPENDS</item>
+ <item>CPACK_DEBIAN_PACKAGE_DESCRIPTION</item>
+ <item>CPACK_DEBIAN_PACKAGE_ENHANCES</item>
+ <item>CPACK_DEBIAN_PACKAGE_EPOCH</item>
+ <item>CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS</item>
+ <item>CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY</item>
+ <item>CPACK_DEBIAN_PACKAGE_HOMEPAGE</item>
+ <item>CPACK_DEBIAN_PACKAGE_MAINTAINER</item>
+ <item>CPACK_DEBIAN_PACKAGE_NAME</item>
+ <item>CPACK_DEBIAN_PACKAGE_PREDEPENDS</item>
+ <item>CPACK_DEBIAN_PACKAGE_PRIORITY</item>
+ <item>CPACK_DEBIAN_PACKAGE_PROVIDES</item>
+ <item>CPACK_DEBIAN_PACKAGE_RECOMMENDS</item>
+ <item>CPACK_DEBIAN_PACKAGE_RELEASE</item>
+ <item>CPACK_DEBIAN_PACKAGE_REPLACES</item>
+ <item>CPACK_DEBIAN_PACKAGE_SECTION</item>
+ <item>CPACK_DEBIAN_PACKAGE_SHLIBDEPS</item>
+ <item>CPACK_DEBIAN_PACKAGE_SOURCE</item>
+ <item>CPACK_DEBIAN_PACKAGE_SUGGESTS</item>
+ <item>CPACK_DEBIAN_PACKAGE_VERSION</item>
+ <item>CPACK_DEB_COMPONENT_INSTALL</item>
+ <item>CPACK_DMG_BACKGROUND_IMAGE</item>
+ <item>CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK</item>
+ <item>CPACK_DMG_DS_STORE</item>
+ <item>CPACK_DMG_DS_STORE_SETUP_SCRIPT</item>
+ <item>CPACK_DMG_FORMAT</item>
+ <item>CPACK_DMG_SLA_DIR</item>
+ <item>CPACK_DMG_SLA_LANGUAGES</item>
+ <item>CPACK_DMG_VOLUME_NAME</item>
<item>CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+ <item>CPACK_GENERATOR</item>
+ <item>CPACK_IFW_ADMIN_TARGET_DIRECTORY</item>
+ <item>CPACK_IFW_BINARYCREATOR_EXECUTABLE</item>
+ <item>CPACK_IFW_DEVTOOL_EXECUTABLE</item>
+ <item>CPACK_IFW_DOWNLOAD_ALL</item>
+ <item>CPACK_IFW_FRAMEWORK_VERSION</item>
+ <item>CPACK_IFW_INSTALLERBASE_EXECUTABLE</item>
+ <item>CPACK_IFW_PACKAGES_DIRECTORIES</item>
+ <item>CPACK_IFW_PACKAGE_ALLOW_NON_ASCII_CHARACTERS</item>
+ <item>CPACK_IFW_PACKAGE_ALLOW_SPACE_IN_PATH</item>
+ <item>CPACK_IFW_PACKAGE_BACKGROUND</item>
+ <item>CPACK_IFW_PACKAGE_BANNER</item>
+ <item>CPACK_IFW_PACKAGE_CONTROL_SCRIPT</item>
+ <item>CPACK_IFW_PACKAGE_GROUP</item>
+ <item>CPACK_IFW_PACKAGE_ICON</item>
+ <item>CPACK_IFW_PACKAGE_LOGO</item>
+ <item>CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_INI_FILE</item>
+ <item>CPACK_IFW_PACKAGE_MAINTENANCE_TOOL_NAME</item>
+ <item>CPACK_IFW_PACKAGE_NAME</item>
+ <item>CPACK_IFW_PACKAGE_PUBLISHER</item>
+ <item>CPACK_IFW_PACKAGE_REMOVE_TARGET_DIR</item>
+ <item>CPACK_IFW_PACKAGE_RESOURCES</item>
+ <item>CPACK_IFW_PACKAGE_START_MENU_DIRECTORY</item>
+ <item>CPACK_IFW_PACKAGE_TITLE</item>
+ <item>CPACK_IFW_PACKAGE_TITLE_COLOR</item>
+ <item>CPACK_IFW_PACKAGE_WATERMARK</item>
+ <item>CPACK_IFW_PACKAGE_WINDOW_ICON</item>
+ <item>CPACK_IFW_PACKAGE_WIZARD_DEFAULT_HEIGHT</item>
+ <item>CPACK_IFW_PACKAGE_WIZARD_DEFAULT_WIDTH</item>
+ <item>CPACK_IFW_PACKAGE_WIZARD_STYLE</item>
+ <item>CPACK_IFW_PRODUCT_URL</item>
+ <item>CPACK_IFW_REPOGEN_EXECUTABLE</item>
+ <item>CPACK_IFW_REPOSITORIES_ALL</item>
+ <item>CPACK_IFW_RESOLVE_DUPLICATE_NAMES</item>
+ <item>CPACK_IFW_ROOT</item>
+ <item>CPACK_IFW_TARGET_DIRECTORY</item>
+ <item>CPACK_IFW_VERBOSE</item>
<item>CPACK_INCLUDE_TOPLEVEL_DIRECTORY</item>
+ <item>CPACK_INSTALLED_DIRECTORIES</item>
+ <item>CPACK_INSTALL_CMAKE_PROJECTS</item>
+ <item>CPACK_INSTALL_COMMANDS</item>
+ <item>CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS</item>
<item>CPACK_INSTALL_SCRIPT</item>
+ <item>CPACK_MONOLITHIC_INSTALL</item>
+ <item>CPACK_NSIS_COMPRESSOR</item>
+ <item>CPACK_NSIS_CONTACT</item>
+ <item>CPACK_NSIS_CREATE_ICONS_EXTRA</item>
+ <item>CPACK_NSIS_DELETE_ICONS_EXTRA</item>
+ <item>CPACK_NSIS_DISPLAY_NAME</item>
+ <item>CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL</item>
+ <item>CPACK_NSIS_EXECUTABLES_DIRECTORY</item>
+ <item>CPACK_NSIS_EXTRA_INSTALL_COMMANDS</item>
+ <item>CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS</item>
+ <item>CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS</item>
+ <item>CPACK_NSIS_HELP_LINK</item>
+ <item>CPACK_NSIS_INSTALLED_ICON_NAME</item>
+ <item>CPACK_NSIS_INSTALLER_MUI_ICON_CODE</item>
+ <item>CPACK_NSIS_INSTALL_ROOT</item>
+ <item>CPACK_NSIS_MENU_LINKS</item>
+ <item>CPACK_NSIS_MODIFY_PATH</item>
+ <item>CPACK_NSIS_MUI_FINISHPAGE_RUN</item>
+ <item>CPACK_NSIS_MUI_ICON</item>
+ <item>CPACK_NSIS_MUI_UNIICON</item>
+ <item>CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP</item>
+ <item>CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP</item>
+ <item>CPACK_NSIS_PACKAGE_NAME</item>
+ <item>CPACK_NSIS_URL_INFO_ABOUT</item>
+ <item>CPACK_NUGET_COMPONENT_INSTALL</item>
+ <item>CPACK_NUGET_PACKAGE_AUTHORS</item>
+ <item>CPACK_NUGET_PACKAGE_COPYRIGHT</item>
+ <item>CPACK_NUGET_PACKAGE_DEBUG</item>
+ <item>CPACK_NUGET_PACKAGE_DEPENDENCIES</item>
+ <item>CPACK_NUGET_PACKAGE_DESCRIPTION</item>
+ <item>CPACK_NUGET_PACKAGE_DESCRIPTION_SUMMARY</item>
+ <item>CPACK_NUGET_PACKAGE_HOMEPAGE_URL</item>
+ <item>CPACK_NUGET_PACKAGE_ICONURL</item>
+ <item>CPACK_NUGET_PACKAGE_LICENSEURL</item>
+ <item>CPACK_NUGET_PACKAGE_NAME</item>
+ <item>CPACK_NUGET_PACKAGE_OWNERS</item>
+ <item>CPACK_NUGET_PACKAGE_RELEASE_NOTES</item>
+ <item>CPACK_NUGET_PACKAGE_TAGS</item>
+ <item>CPACK_NUGET_PACKAGE_TITLE</item>
+ <item>CPACK_NUGET_PACKAGE_VERSION</item>
+ <item>CPACK_OSX_PACKAGE_VERSION</item>
+ <item>CPACK_OUTPUT_CONFIG_FILE</item>
+ <item>CPACK_PACKAGE_CHECKSUM</item>
+ <item>CPACK_PACKAGE_CONTACT</item>
+ <item>CPACK_PACKAGE_DESCRIPTION</item>
+ <item>CPACK_PACKAGE_DESCRIPTION_FILE</item>
+ <item>CPACK_PACKAGE_DESCRIPTION_SUMMARY</item>
+ <item>CPACK_PACKAGE_DIRECTORY</item>
+ <item>CPACK_PACKAGE_EXECUTABLES</item>
+ <item>CPACK_PACKAGE_FILE_NAME</item>
+ <item>CPACK_PACKAGE_HOMEPAGE_URL</item>
+ <item>CPACK_PACKAGE_ICON</item>
+ <item>CPACK_PACKAGE_INSTALL_DIRECTORY</item>
+ <item>CPACK_PACKAGE_INSTALL_REGISTRY_KEY</item>
+ <item>CPACK_PACKAGE_NAME</item>
+ <item>CPACK_PACKAGE_VENDOR</item>
+ <item>CPACK_PACKAGE_VERSION</item>
+ <item>CPACK_PACKAGE_VERSION_MAJOR</item>
+ <item>CPACK_PACKAGE_VERSION_MINOR</item>
+ <item>CPACK_PACKAGE_VERSION_PATCH</item>
<item>CPACK_PACKAGING_INSTALL_PREFIX</item>
+ <item>CPACK_PKGBUILD_IDENTITY_NAME</item>
+ <item>CPACK_PKGBUILD_KEYCHAIN_PATH</item>
+ <item>CPACK_PRODUCTBUILD_IDENTITY_NAME</item>
+ <item>CPACK_PRODUCTBUILD_KEYCHAIN_PATH</item>
+ <item>CPACK_PRODUCTBUILD_RESOURCES_DIR</item>
+ <item>CPACK_PROJECT_CONFIG_FILE</item>
+ <item>CPACK_RESOURCE_FILE_LICENSE</item>
+ <item>CPACK_RESOURCE_FILE_README</item>
+ <item>CPACK_RESOURCE_FILE_WELCOME</item>
+ <item>CPACK_RPM_ADDITIONAL_MAN_DIRS</item>
+ <item>CPACK_RPM_BUILDREQUIRES</item>
+ <item>CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX</item>
+ <item>CPACK_RPM_CHANGELOG_FILE</item>
+ <item>CPACK_RPM_COMPONENT_INSTALL</item>
+ <item>CPACK_RPM_COMPRESSION_TYPE</item>
+ <item>CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS</item>
+ <item>CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS_ADDITION</item>
+ <item>CPACK_RPM_DEBUGINFO_FILE_NAME</item>
+ <item>CPACK_RPM_DEBUGINFO_PACKAGE</item>
+ <item>CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE</item>
+ <item>CPACK_RPM_DEFAULT_DIR_PERMISSIONS</item>
+ <item>CPACK_RPM_DEFAULT_FILE_PERMISSIONS</item>
+ <item>CPACK_RPM_DEFAULT_GROUP</item>
+ <item>CPACK_RPM_DEFAULT_USER</item>
+ <item>CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST</item>
+ <item>CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION</item>
+ <item>CPACK_RPM_FILE_NAME</item>
+ <item>CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE</item>
+ <item>CPACK_RPM_INSTALL_WITH_EXEC</item>
+ <item>CPACK_RPM_MAIN_COMPONENT</item>
+ <item>CPACK_RPM_NO_INSTALL_PREFIX_RELOCATION</item>
+ <item>CPACK_RPM_PACKAGE_ARCHITECTURE</item>
+ <item>CPACK_RPM_PACKAGE_AUTOPROV</item>
+ <item>CPACK_RPM_PACKAGE_AUTOREQ</item>
+ <item>CPACK_RPM_PACKAGE_AUTOREQPROV</item>
+ <item>CPACK_RPM_PACKAGE_CONFLICTS</item>
+ <item>CPACK_RPM_PACKAGE_DEBUG</item>
+ <item>CPACK_RPM_PACKAGE_DESCRIPTION</item>
+ <item>CPACK_RPM_PACKAGE_EPOCH</item>
+ <item>CPACK_RPM_PACKAGE_GROUP</item>
+ <item>CPACK_RPM_PACKAGE_LICENSE</item>
+ <item>CPACK_RPM_PACKAGE_NAME</item>
+ <item>CPACK_RPM_PACKAGE_OBSOLETES</item>
+ <item>CPACK_RPM_PACKAGE_PROVIDES</item>
+ <item>CPACK_RPM_PACKAGE_RELEASE</item>
+ <item>CPACK_RPM_PACKAGE_RELEASE_DIST</item>
+ <item>CPACK_RPM_PACKAGE_RELOCATABLE</item>
+ <item>CPACK_RPM_PACKAGE_REQUIRES</item>
+ <item>CPACK_RPM_PACKAGE_REQUIRES_POST</item>
+ <item>CPACK_RPM_PACKAGE_REQUIRES_POSTUN</item>
+ <item>CPACK_RPM_PACKAGE_REQUIRES_PRE</item>
+ <item>CPACK_RPM_PACKAGE_REQUIRES_PREUN</item>
+ <item>CPACK_RPM_PACKAGE_SOURCES</item>
+ <item>CPACK_RPM_PACKAGE_SUGGESTS</item>
+ <item>CPACK_RPM_PACKAGE_SUMMARY</item>
+ <item>CPACK_RPM_PACKAGE_URL</item>
+ <item>CPACK_RPM_PACKAGE_VENDOR</item>
+ <item>CPACK_RPM_PACKAGE_VERSION</item>
+ <item>CPACK_RPM_POST_INSTALL_SCRIPT_FILE</item>
+ <item>CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE</item>
+ <item>CPACK_RPM_PRE_INSTALL_SCRIPT_FILE</item>
+ <item>CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE</item>
+ <item>CPACK_RPM_RELOCATION_PATHS</item>
+ <item>CPACK_RPM_SOURCE_PKG_BUILD_PARAMS</item>
+ <item>CPACK_RPM_SOURCE_PKG_PACKAGING_INSTALL_PREFIX</item>
+ <item>CPACK_RPM_SPEC_INSTALL_POST</item>
+ <item>CPACK_RPM_SPEC_MORE_DEFINE</item>
+ <item>CPACK_RPM_USER_BINARY_SPECFILE</item>
+ <item>CPACK_RPM_USER_FILELIST</item>
<item>CPACK_SET_DESTDIR</item>
+ <item>CPACK_SOURCE_GENERATOR</item>
+ <item>CPACK_SOURCE_IGNORE_FILES</item>
+ <item>CPACK_SOURCE_OUTPUT_CONFIG_FILE</item>
+ <item>CPACK_SOURCE_PACKAGE_FILE_NAME</item>
+ <item>CPACK_SOURCE_STRIP_FILES</item>
+ <item>CPACK_STRIP_FILES</item>
+ <item>CPACK_SYSTEM_NAME</item>
+ <item>CPACK_TOPLEVEL_TAG</item>
+ <item>CPACK_VERBATIM_VARIABLES</item>
<item>CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</item>
+ <item>CPACK_WIX_CMAKE_PACKAGE_REGISTRY</item>
+ <item>CPACK_WIX_CULTURES</item>
+ <item>CPACK_WIX_EXTENSIONS</item>
+ <item>CPACK_WIX_EXTRA_OBJECTS</item>
+ <item>CPACK_WIX_EXTRA_SOURCES</item>
+ <item>CPACK_WIX_LICENSE_RTF</item>
+ <item>CPACK_WIX_PATCH_FILE</item>
+ <item>CPACK_WIX_PRODUCT_GUID</item>
+ <item>CPACK_WIX_PRODUCT_ICON</item>
+ <item>CPACK_WIX_PROGRAM_MENU_FOLDER</item>
+ <item>CPACK_WIX_ROOT</item>
+ <item>CPACK_WIX_ROOT_FEATURE_DESCRIPTION</item>
+ <item>CPACK_WIX_ROOT_FEATURE_TITLE</item>
+ <item>CPACK_WIX_ROOT_FOLDER_ID</item>
+ <item>CPACK_WIX_SKIP_PROGRAM_FOLDER</item>
+ <item>CPACK_WIX_TEMPLATE</item>
+ <item>CPACK_WIX_UI_BANNER</item>
+ <item>CPACK_WIX_UI_DIALOG</item>
+ <item>CPACK_WIX_UI_REF</item>
+ <item>CPACK_WIX_UPGRADE_GUID</item>
<item>CTEST_BINARY_DIRECTORY</item>
<item>CTEST_BUILD_COMMAND</item>
<item>CTEST_BUILD_NAME</item>
<item>CTEST_BZR_COMMAND</item>
<item>CTEST_BZR_UPDATE_OPTIONS</item>
+ <item>CTEST_CHANGE_ID</item>
<item>CTEST_CHECKOUT_COMMAND</item>
<item>CTEST_CONFIGURATION_TYPE</item>
<item>CTEST_CONFIGURE_COMMAND</item>
<item>CTEST_COVERAGE_COMMAND</item>
<item>CTEST_COVERAGE_EXTRA_FLAGS</item>
<item>CTEST_CURL_OPTIONS</item>
+ <item>CTEST_CUSTOM_COVERAGE_EXCLUDE</item>
+ <item>CTEST_CUSTOM_ERROR_EXCEPTION</item>
+ <item>CTEST_CUSTOM_ERROR_MATCH</item>
+ <item>CTEST_CUSTOM_ERROR_POST_CONTEXT</item>
+ <item>CTEST_CUSTOM_ERROR_PRE_CONTEXT</item>
+ <item>CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE</item>
+ <item>CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS</item>
+ <item>CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS</item>
+ <item>CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE</item>
+ <item>CTEST_CUSTOM_MEMCHECK_IGNORE</item>
+ <item>CTEST_CUSTOM_POST_MEMCHECK</item>
+ <item>CTEST_CUSTOM_POST_TEST</item>
+ <item>CTEST_CUSTOM_PRE_MEMCHECK</item>
+ <item>CTEST_CUSTOM_PRE_TEST</item>
+ <item>CTEST_CUSTOM_TEST_IGNORE</item>
+ <item>CTEST_CUSTOM_WARNING_EXCEPTION</item>
+ <item>CTEST_CUSTOM_WARNING_MATCH</item>
<item>CTEST_CVS_CHECKOUT</item>
<item>CTEST_CVS_COMMAND</item>
<item>CTEST_CVS_UPDATE_OPTIONS</item>
@@ -975,11 +1805,14 @@
<item>CTEST_DROP_SITE_CDASH</item>
<item>CTEST_DROP_SITE_PASSWORD</item>
<item>CTEST_DROP_SITE_USER</item>
+ <item>CTEST_EXTRA_COVERAGE_GLOB</item>
<item>CTEST_GIT_COMMAND</item>
+ <item>CTEST_GIT_INIT_SUBMODULES</item>
<item>CTEST_GIT_UPDATE_CUSTOM</item>
<item>CTEST_GIT_UPDATE_OPTIONS</item>
<item>CTEST_HG_COMMAND</item>
<item>CTEST_HG_UPDATE_OPTIONS</item>
+ <item>CTEST_LABELS_FOR_SUBPROJECTS</item>
<item>CTEST_MEMORYCHECK_COMMAND</item>
<item>CTEST_MEMORYCHECK_COMMAND_OPTIONS</item>
<item>CTEST_MEMORYCHECK_SANITIZER_OPTIONS</item>
@@ -996,6 +1829,7 @@
<item>CTEST_SVN_COMMAND</item>
<item>CTEST_SVN_OPTIONS</item>
<item>CTEST_SVN_UPDATE_OPTIONS</item>
+ <item>CTEST_TEST_LOAD</item>
<item>CTEST_TEST_TIMEOUT</item>
<item>CTEST_TRIGGER_SITE</item>
<item>CTEST_UPDATE_COMMAND</item>
@@ -1003,9 +1837,35 @@
<item>CTEST_UPDATE_VERSION_ONLY</item>
<item>CTEST_USE_LAUNCHERS</item>
<item>CYGWIN</item>
- <item>ENV</item>
<item>EXECUTABLE_OUTPUT_PATH</item>
+ <item>ExternalData_BINARY_ROOT</item>
+ <item>ExternalData_CUSTOM_ERROR</item>
+ <item>ExternalData_CUSTOM_FILE</item>
+ <item>ExternalData_CUSTOM_LOCATION</item>
+ <item>ExternalData_LINK_CONTENT</item>
+ <item>ExternalData_NO_SYMLINKS</item>
+ <item>ExternalData_OBJECT_STORES</item>
+ <item>ExternalData_SERIES_MATCH</item>
+ <item>ExternalData_SERIES_PARSE</item>
+ <item>ExternalData_SERIES_PARSE_NUMBER</item>
+ <item>ExternalData_SERIES_PARSE_PREFIX</item>
+ <item>ExternalData_SERIES_PARSE_SUFFIX</item>
+ <item>ExternalData_SOURCE_ROOT</item>
+ <item>ExternalData_TIMEOUT_ABSOLUTE</item>
+ <item>ExternalData_TIMEOUT_INACTIVITY</item>
+ <item>ExternalData_URL_TEMPLATES</item>
<item>GHS-MULTI</item>
+ <item>GRAPHVIZ_EXECUTABLES</item>
+ <item>GRAPHVIZ_EXTERNAL_LIBS</item>
+ <item>GRAPHVIZ_GENERATE_PER_TARGET</item>
+ <item>GRAPHVIZ_GRAPH_HEADER</item>
+ <item>GRAPHVIZ_GRAPH_NAME</item>
+ <item>GRAPHVIZ_GRAPH_TYPE</item>
+ <item>GRAPHVIZ_IGNORE_TARGETS</item>
+ <item>GRAPHVIZ_MODULE_LIBS</item>
+ <item>GRAPHVIZ_NODE_PREFIX</item>
+ <item>GRAPHVIZ_SHARED_LIBS</item>
+ <item>GRAPHVIZ_STATIC_LIBS</item>
<item>LIBRARY_OUTPUT_PATH</item>
<item>MINGW</item>
<item>MSVC</item>
@@ -1019,8 +1879,25 @@
<item>MSVC80</item>
<item>MSVC90</item>
<item>MSVC_IDE</item>
+ <item>MSVC_TOOLSET_VERSION</item>
<item>MSVC_VERSION</item>
+ <item>PACKAGE_FIND_NAME</item>
+ <item>PACKAGE_FIND_VERSION</item>
+ <item>PACKAGE_FIND_VERSION_COUNT</item>
+ <item>PACKAGE_FIND_VERSION_MAJOR</item>
+ <item>PACKAGE_FIND_VERSION_MINOR</item>
+ <item>PACKAGE_FIND_VERSION_PATCH</item>
+ <item>PACKAGE_FIND_VERSION_TWEAK</item>
+ <item>PACKAGE_VERSION</item>
+ <item>PACKAGE_VERSION_COMPATIBLE</item>
+ <item>PACKAGE_VERSION_EXACT</item>
+ <item>PACKAGE_VERSION_UNSUITABLE</item>
+ <item>PKG_CONFIG_EXECUTABLE</item>
+ <item>PKG_CONFIG_USE_CMAKE_PREFIX_PATH</item>
+ <item>PKG_CONFIG_VERSION_STRING</item>
<item>PROJECT_BINARY_DIR</item>
+ <item>PROJECT_DESCRIPTION</item>
+ <item>PROJECT_HOMEPAGE_URL</item>
<item>PROJECT_NAME</item>
<item>PROJECT_SOURCE_DIR</item>
<item>PROJECT_VERSION</item>
@@ -1028,273 +1905,1792 @@
<item>PROJECT_VERSION_MINOR</item>
<item>PROJECT_VERSION_PATCH</item>
<item>PROJECT_VERSION_TWEAK</item>
+ <item>QTIFWDIR</item>
+ <item>THREADS_PREFER_PTHREAD_FLAG</item>
<item>UNIX</item>
<item>WIN32</item>
<item>WINCE</item>
<item>WINDOWS_PHONE</item>
<item>WINDOWS_STORE</item>
+ <item>XCODE</item>
<item>XCODE_VERSION</item>
</list>
-
- <list name="simple_generator_expr">
- <item>CONFIGURATION</item>
- <item>ANGLE-R</item>
- <item>COMMA</item>
- <item>SEMICOLON</item>
- <item>INSTALL_PREFIX</item>
+ <list name="global-properties">
+ <item>ALLOW_DUPLICATE_CUSTOM_TARGETS</item>
+ <item>AUTOGEN_SOURCE_GROUP</item>
+ <item>AUTOGEN_TARGETS_FOLDER</item>
+ <item>AUTOMOC_SOURCE_GROUP</item>
+ <item>AUTOMOC_TARGETS_FOLDER</item>
+ <item>AUTORCC_SOURCE_GROUP</item>
+ <item>CMAKE_CXX_KNOWN_FEATURES</item>
+ <item>CMAKE_C_KNOWN_FEATURES</item>
+ <item>DEBUG_CONFIGURATIONS</item>
+ <item>DISABLED_FEATURES</item>
+ <item>ECLIPSE_EXTRA_NATURES</item>
+ <item>ENABLED_FEATURES</item>
+ <item>ENABLED_LANGUAGES</item>
+ <item>FIND_LIBRARY_USE_LIB32_PATHS</item>
+ <item>FIND_LIBRARY_USE_LIB64_PATHS</item>
+ <item>FIND_LIBRARY_USE_LIBX32_PATHS</item>
+ <item>FIND_LIBRARY_USE_OPENBSD_VERSIONING</item>
+ <item>FeatureSummary_DEFAULT_PKG_TYPE</item>
+ <item>FeatureSummary_PKG_TYPES</item>
+ <item>FeatureSummary_REQUIRED_PKG_TYPES</item>
+ <item>GENERATOR_IS_MULTI_CONFIG</item>
+ <item>GLOBAL_DEPENDS_DEBUG_MODE</item>
+ <item>GLOBAL_DEPENDS_NO_CYCLES</item>
+ <item>IN_TRY_COMPILE</item>
+ <item>JOB_POOLS</item>
+ <item>PACKAGES_FOUND</item>
+ <item>PACKAGES_NOT_FOUND</item>
+ <item>PREDEFINED_TARGETS_FOLDER</item>
+ <item>REPORT_UNDEFINED_PROPERTIES</item>
+ <item>RULE_LAUNCH_COMPILE</item>
+ <item>RULE_LAUNCH_CUSTOM</item>
+ <item>RULE_LAUNCH_LINK</item>
+ <item>RULE_MESSAGES</item>
+ <item>TARGET_ARCHIVES_MAY_BE_SHARED_LIBS</item>
+ <item>TARGET_MESSAGES</item>
+ <item>TARGET_SUPPORTS_SHARED_LIBS</item>
+ <item>USE_FOLDERS</item>
+ <item>XCODE_EMIT_EFFECTIVE_PLATFORM_NAME</item>
+ </list>
+ <list name="directory-properties">
+ <item>ADDITIONAL_MAKE_CLEAN_FILES</item>
+ <item>BINARY_DIR</item>
+ <item>BUILDSYSTEM_TARGETS</item>
+ <item>CACHE_VARIABLES</item>
+ <item>CLEAN_NO_CUSTOM</item>
+ <item>CMAKE_CONFIGURE_DEPENDS</item>
+ <item>COMPILE_DEFINITIONS</item>
+ <item>COMPILE_OPTIONS</item>
+ <item>DEFINITIONS</item>
+ <item>EXCLUDE_FROM_ALL</item>
+ <item>IMPLICIT_DEPENDS_INCLUDE_TRANSFORM</item>
+ <item>INCLUDE_DIRECTORIES</item>
+ <item>INCLUDE_REGULAR_EXPRESSION</item>
+ <item>INTERPROCEDURAL_OPTIMIZATION</item>
+ <item>LABELS</item>
+ <item>LINK_DIRECTORIES</item>
+ <item>LISTFILE_STACK</item>
+ <item>MACROS</item>
+ <item>PARENT_DIRECTORY</item>
+ <item>RULE_LAUNCH_COMPILE</item>
+ <item>RULE_LAUNCH_CUSTOM</item>
+ <item>RULE_LAUNCH_LINK</item>
+ <item>SOURCE_DIR</item>
+ <item>SUBDIRECTORIES</item>
+ <item>TESTS</item>
+ <item>TEST_INCLUDE_FILE</item>
+ <item>TEST_INCLUDE_FILES</item>
+ <item>VARIABLES</item>
+ <item>VS_STARTUP_PROJECT</item>
+ </list>
+ <list name="target-properties">
+ <item>ALIASED_TARGET</item>
+ <item>ANDROID_ANT_ADDITIONAL_OPTIONS</item>
+ <item>ANDROID_API</item>
+ <item>ANDROID_API_MIN</item>
+ <item>ANDROID_ARCH</item>
+ <item>ANDROID_ASSETS_DIRECTORIES</item>
+ <item>ANDROID_GUI</item>
+ <item>ANDROID_JAR_DEPENDENCIES</item>
+ <item>ANDROID_JAR_DIRECTORIES</item>
+ <item>ANDROID_JAVA_SOURCE_DIR</item>
+ <item>ANDROID_NATIVE_LIB_DEPENDENCIES</item>
+ <item>ANDROID_NATIVE_LIB_DIRECTORIES</item>
+ <item>ANDROID_PROCESS_MAX</item>
+ <item>ANDROID_PROGUARD</item>
+ <item>ANDROID_PROGUARD_CONFIG_PATH</item>
+ <item>ANDROID_SECURE_PROPS_PATH</item>
+ <item>ANDROID_SKIP_ANT_STEP</item>
+ <item>ANDROID_STL_TYPE</item>
+ <item>ARCHIVE_OUTPUT_DIRECTORY</item>
+ <item>ARCHIVE_OUTPUT_NAME</item>
+ <item>AUTOGEN_BUILD_DIR</item>
+ <item>AUTOGEN_TARGET_DEPENDS</item>
+ <item>AUTOMOC</item>
+ <item>AUTOMOC_DEPEND_FILTERS</item>
+ <item>AUTOMOC_MOC_OPTIONS</item>
+ <item>AUTORCC</item>
+ <item>AUTORCC_OPTIONS</item>
+ <item>AUTOUIC</item>
+ <item>AUTOUIC_OPTIONS</item>
+ <item>AUTOUIC_SEARCH_PATHS</item>
+ <item>BINARY_DIR</item>
+ <item>BUILD_RPATH</item>
+ <item>BUILD_WITH_INSTALL_NAME_DIR</item>
+ <item>BUILD_WITH_INSTALL_RPATH</item>
+ <item>BUNDLE</item>
+ <item>BUNDLE_EXTENSION</item>
+ <item>COMMON_LANGUAGE_RUNTIME</item>
+ <item>COMPATIBLE_INTERFACE_BOOL</item>
+ <item>COMPATIBLE_INTERFACE_NUMBER_MAX</item>
+ <item>COMPATIBLE_INTERFACE_NUMBER_MIN</item>
+ <item>COMPATIBLE_INTERFACE_STRING</item>
+ <item>COMPILE_DEFINITIONS</item>
+ <item>COMPILE_FEATURES</item>
+ <item>COMPILE_FLAGS</item>
+ <item>COMPILE_OPTIONS</item>
+ <item>COMPILE_PDB_NAME</item>
+ <item>COMPILE_PDB_OUTPUT_DIRECTORY</item>
+ <item>CROSSCOMPILING_EMULATOR</item>
+ <item>CUDA_EXTENSIONS</item>
+ <item>CUDA_PTX_COMPILATION</item>
+ <item>CUDA_RESOLVE_DEVICE_SYMBOLS</item>
+ <item>CUDA_SEPARABLE_COMPILATION</item>
+ <item>CUDA_STANDARD</item>
+ <item>CUDA_STANDARD_REQUIRED</item>
+ <item>CXX_EXTENSIONS</item>
+ <item>CXX_STANDARD</item>
+ <item>CXX_STANDARD_REQUIRED</item>
+ <item>C_EXTENSIONS</item>
+ <item>C_STANDARD</item>
+ <item>C_STANDARD_REQUIRED</item>
+ <item>DEFINE_SYMBOL</item>
+ <item>DEPLOYMENT_REMOTE_DIRECTORY</item>
+ <item>DOTNET_TARGET_FRAMEWORK_VERSION</item>
+ <item>ENABLE_EXPORTS</item>
+ <item>EXCLUDE_FROM_ALL</item>
+ <item>EXCLUDE_FROM_DEFAULT_BUILD</item>
+ <item>EXPORT_NAME</item>
+ <item>EXPORT_PROPERTIES</item>
+ <item>EchoString</item>
+ <item>FOLDER</item>
+ <item>FRAMEWORK</item>
+ <item>FRAMEWORK_VERSION</item>
+ <item>Fortran_FORMAT</item>
+ <item>Fortran_MODULE_DIRECTORY</item>
+ <item>GENERATOR_FILE_NAME</item>
+ <item>GNUtoMS</item>
+ <item>HAS_CXX</item>
+ <item>IMPLICIT_DEPENDS_INCLUDE_TRANSFORM</item>
+ <item>IMPORTED</item>
+ <item>IMPORTED_COMMON_LANGUAGE_RUNTIME</item>
+ <item>IMPORTED_CONFIGURATIONS</item>
+ <item>IMPORTED_GLOBAL</item>
+ <item>IMPORTED_IMPLIB</item>
+ <item>IMPORTED_LIBNAME</item>
+ <item>IMPORTED_LINK_DEPENDENT_LIBRARIES</item>
+ <item>IMPORTED_LINK_INTERFACE_LANGUAGES</item>
+ <item>IMPORTED_LINK_INTERFACE_LIBRARIES</item>
+ <item>IMPORTED_LINK_INTERFACE_MULTIPLICITY</item>
+ <item>IMPORTED_LOCATION</item>
+ <item>IMPORTED_NO_SONAME</item>
+ <item>IMPORTED_OBJECTS</item>
+ <item>IMPORTED_SONAME</item>
+ <item>IMPORT_PREFIX</item>
+ <item>IMPORT_SUFFIX</item>
+ <item>INCLUDE_DIRECTORIES</item>
+ <item>INSTALL_NAME_DIR</item>
+ <item>INSTALL_RPATH</item>
+ <item>INSTALL_RPATH_USE_LINK_PATH</item>
+ <item>INTERFACE_AUTOUIC_OPTIONS</item>
+ <item>INTERFACE_COMPILE_DEFINITIONS</item>
+ <item>INTERFACE_COMPILE_FEATURES</item>
+ <item>INTERFACE_COMPILE_OPTIONS</item>
+ <item>INTERFACE_INCLUDE_DIRECTORIES</item>
+ <item>INTERFACE_LINK_LIBRARIES</item>
+ <item>INTERFACE_POSITION_INDEPENDENT_CODE</item>
+ <item>INTERFACE_SOURCES</item>
+ <item>INTERFACE_SYSTEM_INCLUDE_DIRECTORIES</item>
+ <item>INTERPROCEDURAL_OPTIMIZATION</item>
+ <item>IOS_INSTALL_COMBINED</item>
+ <item>JOB_POOL_COMPILE</item>
+ <item>JOB_POOL_LINK</item>
+ <item>LABELS</item>
+ <item>LIBRARY_OUTPUT_DIRECTORY</item>
+ <item>LIBRARY_OUTPUT_NAME</item>
+ <item>LINKER_LANGUAGE</item>
+ <item>LINK_DEPENDS</item>
+ <item>LINK_DEPENDS_NO_SHARED</item>
+ <item>LINK_FLAGS</item>
+ <item>LINK_INTERFACE_LIBRARIES</item>
+ <item>LINK_INTERFACE_MULTIPLICITY</item>
+ <item>LINK_LIBRARIES</item>
+ <item>LINK_SEARCH_END_STATIC</item>
+ <item>LINK_SEARCH_START_STATIC</item>
+ <item>LINK_WHAT_YOU_USE</item>
+ <item>LOCATION</item>
+ <item>MACOSX_BUNDLE</item>
+ <item>MACOSX_BUNDLE_INFO_PLIST</item>
+ <item>MACOSX_FRAMEWORK_INFO_PLIST</item>
+ <item>MACOSX_RPATH</item>
+ <item>MANUALLY_ADDED_DEPENDENCIES</item>
+ <item>NAME</item>
+ <item>NO_SONAME</item>
+ <item>NO_SYSTEM_FROM_IMPORTED</item>
+ <item>OSX_ARCHITECTURES</item>
+ <item>OUTPUT_NAME</item>
+ <item>PDB_NAME</item>
+ <item>PDB_OUTPUT_DIRECTORY</item>
+ <item>POSITION_INDEPENDENT_CODE</item>
+ <item>PREFIX</item>
+ <item>PRIVATE_HEADER</item>
+ <item>PROJECT_LABEL</item>
+ <item>PUBLIC_HEADER</item>
+ <item>RESOURCE</item>
+ <item>RULE_LAUNCH_COMPILE</item>
+ <item>RULE_LAUNCH_CUSTOM</item>
+ <item>RULE_LAUNCH_LINK</item>
+ <item>RUNTIME_OUTPUT_DIRECTORY</item>
+ <item>RUNTIME_OUTPUT_NAME</item>
+ <item>SKIP_BUILD_RPATH</item>
+ <item>SOURCES</item>
+ <item>SOURCE_DIR</item>
+ <item>SOVERSION</item>
+ <item>STATIC_LIBRARY_FLAGS</item>
+ <item>SUFFIX</item>
+ <item>TYPE</item>
+ <item>VERSION</item>
+ <item>VISIBILITY_INLINES_HIDDEN</item>
+ <item>VS_CONFIGURATION_TYPE</item>
+ <item>VS_DEBUGGER_COMMAND</item>
+ <item>VS_DEBUGGER_WORKING_DIRECTORY</item>
+ <item>VS_DESKTOP_EXTENSIONS_VERSION</item>
+ <item>VS_DOTNET_REFERENCES</item>
+ <item>VS_DOTNET_REFERENCES_COPY_LOCAL</item>
+ <item>VS_DOTNET_TARGET_FRAMEWORK_VERSION</item>
+ <item>VS_GLOBAL_KEYWORD</item>
+ <item>VS_GLOBAL_PROJECT_TYPES</item>
+ <item>VS_GLOBAL_ROOTNAMESPACE</item>
+ <item>VS_IOT_EXTENSIONS_VERSION</item>
+ <item>VS_IOT_STARTUP_TASK</item>
+ <item>VS_KEYWORD</item>
+ <item>VS_MOBILE_EXTENSIONS_VERSION</item>
+ <item>VS_SCC_AUXPATH</item>
+ <item>VS_SCC_LOCALPATH</item>
+ <item>VS_SCC_PROJECTNAME</item>
+ <item>VS_SCC_PROVIDER</item>
+ <item>VS_SDK_REFERENCES</item>
+ <item>VS_USER_PROPS</item>
+ <item>VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION</item>
+ <item>VS_WINRT_COMPONENT</item>
+ <item>VS_WINRT_EXTENSIONS</item>
+ <item>VS_WINRT_REFERENCES</item>
+ <item>WIN32_EXECUTABLE</item>
+ <item>WINDOWS_EXPORT_ALL_SYMBOLS</item>
+ <item>XCODE_EXPLICIT_FILE_TYPE</item>
+ <item>XCODE_PRODUCT_TYPE</item>
+ <item>XCTEST</item>
+ </list>
+ <list name="source-properties">
+ <item>ABSTRACT</item>
+ <item>AUTORCC_OPTIONS</item>
+ <item>AUTOUIC_OPTIONS</item>
+ <item>COMPILE_DEFINITIONS</item>
+ <item>COMPILE_FLAGS</item>
+ <item>COMPILE_OPTIONS</item>
+ <item>EXTERNAL_OBJECT</item>
+ <item>Fortran_FORMAT</item>
+ <item>GENERATED</item>
+ <item>HEADER_FILE_ONLY</item>
+ <item>INCLUDE_DIRECTORIES</item>
+ <item>KEEP_EXTENSION</item>
+ <item>LABELS</item>
+ <item>LANGUAGE</item>
+ <item>LOCATION</item>
+ <item>MACOSX_PACKAGE_LOCATION</item>
+ <item>OBJECT_DEPENDS</item>
+ <item>OBJECT_OUTPUTS</item>
+ <item>SKIP_AUTOGEN</item>
+ <item>SKIP_AUTOMOC</item>
+ <item>SKIP_AUTORCC</item>
+ <item>SKIP_AUTOUIC</item>
+ <item>SYMBOLIC</item>
+ <item>VS_COPY_TO_OUT_DIR</item>
+ <item>VS_DEPLOYMENT_CONTENT</item>
+ <item>VS_DEPLOYMENT_LOCATION</item>
+ <item>VS_INCLUDE_IN_VSIX</item>
+ <item>VS_RESOURCE_GENERATOR</item>
+ <item>VS_SHADER_DISABLE_OPTIMIZATIONS</item>
+ <item>VS_SHADER_ENABLE_DEBUG</item>
+ <item>VS_SHADER_ENTRYPOINT</item>
+ <item>VS_SHADER_FLAGS</item>
+ <item>VS_SHADER_MODEL</item>
+ <item>VS_SHADER_OBJECT_FILE_NAME</item>
+ <item>VS_SHADER_OUTPUT_HEADER_FILE</item>
+ <item>VS_SHADER_TYPE</item>
+ <item>VS_SHADER_VARIABLE_NAME</item>
+ <item>VS_TOOL_OVERRIDE</item>
+ <item>VS_XAML_TYPE</item>
+ <item>WRAP_EXCLUDE</item>
+ <item>XCODE_EXPLICIT_FILE_TYPE</item>
+ <item>XCODE_FILE_ATTRIBUTES</item>
+ <item>XCODE_LAST_KNOWN_FILE_TYPE</item>
+ </list>
+ <list name="test-properties">
+ <item>ATTACHED_FILES</item>
+ <item>ATTACHED_FILES_ON_FAIL</item>
+ <item>COST</item>
+ <item>DEPENDS</item>
+ <item>DISABLED</item>
+ <item>ENVIRONMENT</item>
+ <item>FAIL_REGULAR_EXPRESSION</item>
+ <item>FIXTURES_CLEANUP</item>
+ <item>FIXTURES_REQUIRED</item>
+ <item>FIXTURES_SETUP</item>
+ <item>LABELS</item>
+ <item>MEASUREMENT</item>
+ <item>PASS_REGULAR_EXPRESSION</item>
+ <item>PROCESSORS</item>
+ <item>PROCESSOR_AFFINITY</item>
+ <item>REQUIRED_FILES</item>
+ <item>RESOURCE_LOCK</item>
+ <item>RUN_SERIAL</item>
+ <item>SKIP_RETURN_CODE</item>
+ <item>TIMEOUT</item>
+ <item>TIMEOUT_AFTER_MATCH</item>
+ <item>WILL_FAIL</item>
+ <item>WORKING_DIRECTORY</item>
+ </list>
+ <list name="cache-properties">
+ <item>ADVANCED</item>
+ <item>HELPSTRING</item>
+ <item>MODIFIED</item>
+ <item>STRINGS</item>
+ <item>TYPE</item>
+ <item>VALUE</item>
+ </list>
+ <list name="install-properties">
+ <item>CPACK_DESKTOP_SHORTCUTS</item>
+ <item>CPACK_NEVER_OVERWRITE</item>
+ <item>CPACK_PERMANENT</item>
+ <item>CPACK_STARTUP_SHORTCUTS</item>
+ <item>CPACK_START_MENU_SHORTCUTS</item>
+ <item>CPACK_WIX_ACL</item>
</list>
- <list name="generator_expr">
- <!-- Logical Expressions -->
+ <list name="generator-expressions">
<item>0</item>
<item>1</item>
- <item>BOOL</item>
<item>AND</item>
- <item>OR</item>
- <item>NOT</item>
- <item>STREQUAL</item>
- <item>EQUAL</item>
+ <item>ANGLE-R</item>
+ <item>BOOL</item>
+ <item>BUILD_INTERFACE</item>
+ <item>COMMA</item>
+ <item>COMPILE_FEATURES</item>
+ <item>COMPILE_LANGUAGE</item>
<item>CONFIG</item>
- <item>PLATFORM_ID</item>
- <item>C_COMPILER_ID</item>
<item>CXX_COMPILER_ID</item>
- <item>VERSION_GREATER</item>
- <item>VERSION_LESS</item>
- <item>VERSION_EQUAL</item>
- <item>C_COMPILER_VERSION</item>
<item>CXX_COMPILER_VERSION</item>
- <item>TARGET_POLICY</item>
- <item>COMPILER_FEATURES</item>
- <!-- Informational Expressions -->
- <item>CONFIGURATION</item>
+ <item>C_COMPILER_ID</item>
+ <item>C_COMPILER_VERSION</item>
+ <item>EQUAL</item>
+ <item>GENEX_EVAL</item>
+ <item>IF</item>
+ <item>INSTALL_INTERFACE</item>
+ <item>INSTALL_PREFIX</item>
+ <item>IN_LIST</item>
+ <item>JOIN</item>
+ <item>LINK_ONLY</item>
+ <item>LOWER_CASE</item>
+ <item>MAKE_C_IDENTIFIER</item>
+ <item>NOT</item>
+ <item>OR</item>
+ <item>PLATFORM_ID</item>
+ <item>SEMICOLON</item>
+ <item>SHELL_PATH</item>
+ <item>STREQUAL</item>
+ <item>TARGET_BUNDLE_CONTENT_DIR</item>
+ <item>TARGET_BUNDLE_DIR</item>
+ <item>TARGET_EXISTS</item>
<item>TARGET_FILE</item>
- <item>TARGET_FILE_NAME</item>
<item>TARGET_FILE_DIR</item>
+ <item>TARGET_FILE_NAME</item>
+ <item>TARGET_GENEX_EVAL</item>
<item>TARGET_LINKER_FILE</item>
- <item>TARGET_LINKER_FILE_NAME</item>
<item>TARGET_LINKER_FILE_DIR</item>
- <item>TARGET_SONAME_FILE</item>
- <item>TARGET_SONAME_FILE_NAME</item>
- <item>TARGET_SONAME_FILE_DIR</item>
+ <item>TARGET_LINKER_FILE_NAME</item>
+ <item>TARGET_NAME</item>
+ <item>TARGET_NAME_IF_EXISTS</item>
+ <item>TARGET_OBJECTS</item>
<item>TARGET_PDB_FILE</item>
- <item>TARGET_PDB_FILE_NAME</item>
<item>TARGET_PDB_FILE_DIR</item>
+ <item>TARGET_PDB_FILE_NAME</item>
+ <item>TARGET_POLICY</item>
<item>TARGET_PROPERTY</item>
- <item>INSTALL_PREFIX</item>
- <!-- Output Expressions -->
- <item>JOIN</item>
- <item>ANGLE-R</item>
- <item>COMMA</item>
- <item>SEMICOLON</item>
- <item>TARGET_NAME</item>
- <item>LINK_ONLY</item>
- <item>INSTALL_INTERFACE</item>
- <item>BUILD_INTERFACE</item>
- <item>LOWER_CASE</item>
+ <item>TARGET_SONAME_FILE</item>
+ <item>TARGET_SONAME_FILE_DIR</item>
+ <item>TARGET_SONAME_FILE_NAME</item>
<item>UPPER_CASE</item>
- <item>MAKE_C_IDENTIFIER</item>
- <item>TARGET_OBJECTS</item>
- <!-- TODO Is this from CMake 2.x? -->
- <item>TARGET_DIR</item>
+ <item>VERSION_EQUAL</item>
+ <item>VERSION_GREATER</item>
+ <item>VERSION_GREATER_EQUAL</item>
+ <item>VERSION_LESS</item>
+ <item>VERSION_LESS_EQUAL</item>
</list>
<contexts>
+
<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text">
<DetectSpaces/>
-
- <!-- handle folding for if else elseif endif blocks -->
- <WordDetect String="if" attribute="Commands" context="Command" beginRegion="ifthenelse" insensitive="true" />
- <WordDetect String="else" attribute="Commands" context="Command" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" />
- <WordDetect String="elseif" attribute="Commands" context="Command" endRegion="ifthenelse" beginRegion="ifthenelse" insensitive="true" />
- <WordDetect String="endif" attribute="Commands" context="Command" endRegion="ifthenelse" insensitive="true" />
-
- <!-- handle folding for macro endmacro blocks -->
- <WordDetect String="macro" attribute="Commands" context="Command" beginRegion="macro" insensitive="true" />
- <WordDetect String="endmacro" attribute="Commands" context="Command" endRegion="macro" insensitive="true" />
-
- <!-- handle folding for foreach endforeach blocks -->
- <WordDetect String="foreach" attribute="Commands" context="Command" beginRegion="foreach" insensitive="true" />
- <WordDetect String="endforeach" attribute="Commands" context="Command" endRegion="foreach" insensitive="true" />
-
- <!-- handle folding for while endwhile blocks -->
- <WordDetect String="while" attribute="Commands" context="Command" beginRegion="while" insensitive="true" />
- <WordDetect String="endwhile" attribute="Commands" context="Command" endRegion="while" insensitive="true" />
-
- <keyword attribute="Commands" context="Command" String="commands" insensitive="true" />
- <keyword attribute="Third-Party Commands" context="#stay" String="itkvtk_commands" insensitive="true" />
- <RegExpr attribute="Region Marker" context="#stay" String="#\s*BEGIN.*$" beginRegion="block" firstNonSpace="true" />
- <RegExpr attribute="Region Marker" context="#stay" String="#\s*END.*$" endRegion="block" firstNonSpace="true" />
+ <WordDetect String="break" insensitive="true" attribute="Command" context="break_ctx" />
+ <WordDetect String="cmake_host_system_information" insensitive="true" attribute="Command" context="cmake_host_system_information_ctx" />
+ <WordDetect String="cmake_minimum_required" insensitive="true" attribute="Command" context="cmake_minimum_required_ctx" />
+ <WordDetect String="cmake_parse_arguments" insensitive="true" attribute="Command" context="cmake_parse_arguments_ctx" />
+ <WordDetect String="cmake_policy" insensitive="true" attribute="Command" context="cmake_policy_ctx" />
+ <WordDetect String="configure_file" insensitive="true" attribute="Command" context="configure_file_ctx" />
+ <WordDetect String="continue" insensitive="true" attribute="Command" context="continue_ctx" />
+ <WordDetect String="elseif" insensitive="true" attribute="Command" context="elseif_ctx" />
+ <WordDetect String="else" insensitive="true" attribute="Command" context="else_ctx" />
+ <WordDetect String="endforeach" insensitive="true" attribute="Command" context="endforeach_ctx" />
+ <WordDetect String="endfunction" insensitive="true" attribute="Command" context="endfunction_ctx" />
+ <WordDetect String="endif" insensitive="true" attribute="Command" context="endif_ctx" />
+ <WordDetect String="endmacro" insensitive="true" attribute="Command" context="endmacro_ctx" />
+ <WordDetect String="endwhile" insensitive="true" attribute="Command" context="endwhile_ctx" />
+ <WordDetect String="execute_process" insensitive="true" attribute="Command" context="execute_process_ctx" />
+ <WordDetect String="file" insensitive="true" attribute="Command" context="file_ctx" />
+ <WordDetect String="find_file" insensitive="true" attribute="Command" context="find_file_ctx" />
+ <WordDetect String="find_library" insensitive="true" attribute="Command" context="find_library_ctx" />
+ <WordDetect String="find_package" insensitive="true" attribute="Command" context="find_package_ctx" />
+ <WordDetect String="find_path" insensitive="true" attribute="Command" context="find_path_ctx" />
+ <WordDetect String="find_program" insensitive="true" attribute="Command" context="find_program_ctx" />
+ <WordDetect String="foreach" insensitive="true" attribute="Command" context="foreach_ctx" />
+ <WordDetect String="function" insensitive="true" attribute="Command" context="function_ctx" />
+ <WordDetect String="get_cmake_property" insensitive="true" attribute="Command" context="get_cmake_property_ctx" />
+ <WordDetect String="get_directory_property" insensitive="true" attribute="Command" context="get_directory_property_ctx" />
+ <WordDetect String="get_filename_component" insensitive="true" attribute="Command" context="get_filename_component_ctx" />
+ <WordDetect String="get_property" insensitive="true" attribute="Command" context="get_property_ctx" />
+ <WordDetect String="if" insensitive="true" attribute="Command" context="if_ctx" />
+ <WordDetect String="include" insensitive="true" attribute="Command" context="include_ctx" />
+ <WordDetect String="include_guard" insensitive="true" attribute="Command" context="include_guard_ctx" />
+ <WordDetect String="list" insensitive="true" attribute="Command" context="list_ctx" />
+ <WordDetect String="macro" insensitive="true" attribute="Command" context="macro_ctx" />
+ <WordDetect String="mark_as_advanced" insensitive="true" attribute="Command" context="mark_as_advanced_ctx" />
+ <WordDetect String="math" insensitive="true" attribute="Command" context="math_ctx" />
+ <WordDetect String="message" insensitive="true" attribute="Command" context="message_ctx" />
+ <WordDetect String="option" insensitive="true" attribute="Command" context="option_ctx" />
+ <WordDetect String="return" insensitive="true" attribute="Command" context="return_ctx" />
+ <WordDetect String="separate_arguments" insensitive="true" attribute="Command" context="separate_arguments_ctx" />
+ <WordDetect String="set_directory_properties" insensitive="true" attribute="Command" context="set_directory_properties_ctx" />
+ <WordDetect String="set_property" insensitive="true" attribute="Command" context="set_property_ctx" />
+ <WordDetect String="set" insensitive="true" attribute="Command" context="set_ctx" />
+ <WordDetect String="site_name" insensitive="true" attribute="Command" context="site_name_ctx" />
+ <WordDetect String="string" insensitive="true" attribute="Command" context="string_ctx" />
+ <WordDetect String="unset" insensitive="true" attribute="Command" context="unset_ctx" />
+ <WordDetect String="variable_watch" insensitive="true" attribute="Command" context="variable_watch_ctx" />
+ <WordDetect String="while" insensitive="true" attribute="Command" context="while_ctx" />
+ <WordDetect String="add_compile_definitions" insensitive="true" attribute="Command" context="add_compile_definitions_ctx" />
+ <WordDetect String="add_compile_options" insensitive="true" attribute="Command" context="add_compile_options_ctx" />
+ <WordDetect String="add_custom_command" insensitive="true" attribute="Command" context="add_custom_command_ctx" />
+ <WordDetect String="add_custom_target" insensitive="true" attribute="Command" context="add_custom_target_ctx" />
+ <WordDetect String="add_definitions" insensitive="true" attribute="Command" context="add_definitions_ctx" />
+ <WordDetect String="add_dependencies" insensitive="true" attribute="Command" context="add_dependencies_ctx" />
+ <WordDetect String="add_executable" insensitive="true" attribute="Command" context="add_executable_ctx" />
+ <WordDetect String="add_library" insensitive="true" attribute="Command" context="add_library_ctx" />
+ <WordDetect String="add_subdirectory" insensitive="true" attribute="Command" context="add_subdirectory_ctx" />
+ <WordDetect String="add_test" insensitive="true" attribute="Command" context="add_test_ctx" />
+ <WordDetect String="aux_source_directory" insensitive="true" attribute="Command" context="aux_source_directory_ctx" />
+ <WordDetect String="build_command" insensitive="true" attribute="Command" context="build_command_ctx" />
+ <WordDetect String="create_test_sourcelist" insensitive="true" attribute="Command" context="create_test_sourcelist_ctx" />
+ <WordDetect String="define_property" insensitive="true" attribute="Command" context="define_property_ctx" />
+ <WordDetect String="enable_language" insensitive="true" attribute="Command" context="enable_language_ctx" />
+ <WordDetect String="enable_testing" insensitive="true" attribute="Command" context="enable_testing_ctx" />
+ <WordDetect String="export" insensitive="true" attribute="Command" context="export_ctx" />
+ <WordDetect String="fltk_wrap_ui" insensitive="true" attribute="Command" context="fltk_wrap_ui_ctx" />
+ <WordDetect String="get_source_file_property" insensitive="true" attribute="Command" context="get_source_file_property_ctx" />
+ <WordDetect String="get_target_property" insensitive="true" attribute="Command" context="get_target_property_ctx" />
+ <WordDetect String="get_test_property" insensitive="true" attribute="Command" context="get_test_property_ctx" />
+ <WordDetect String="include_directories" insensitive="true" attribute="Command" context="include_directories_ctx" />
+ <WordDetect String="include_external_msproject" insensitive="true" attribute="Command" context="include_external_msproject_ctx" />
+ <WordDetect String="include_regular_expression" insensitive="true" attribute="Command" context="include_regular_expression_ctx" />
+ <WordDetect String="install" insensitive="true" attribute="Command" context="install_ctx" />
+ <WordDetect String="link_directories" insensitive="true" attribute="Command" context="link_directories_ctx" />
+ <WordDetect String="link_libraries" insensitive="true" attribute="Command" context="link_libraries_ctx" />
+ <WordDetect String="load_cache" insensitive="true" attribute="Command" context="load_cache_ctx" />
+ <WordDetect String="project" insensitive="true" attribute="Command" context="project_ctx" />
+ <WordDetect String="qt_wrap_cpp" insensitive="true" attribute="Command" context="qt_wrap_cpp_ctx" />
+ <WordDetect String="qt_wrap_ui" insensitive="true" attribute="Command" context="qt_wrap_ui_ctx" />
+ <WordDetect String="remove_definitions" insensitive="true" attribute="Command" context="remove_definitions_ctx" />
+ <WordDetect String="set_source_files_properties" insensitive="true" attribute="Command" context="set_source_files_properties_ctx" />
+ <WordDetect String="set_target_properties" insensitive="true" attribute="Command" context="set_target_properties_ctx" />
+ <WordDetect String="set_tests_properties" insensitive="true" attribute="Command" context="set_tests_properties_ctx" />
+ <WordDetect String="source_group" insensitive="true" attribute="Command" context="source_group_ctx" />
+ <WordDetect String="target_compile_definitions" insensitive="true" attribute="Command" context="target_compile_definitions_ctx" />
+ <WordDetect String="target_compile_features" insensitive="true" attribute="Command" context="target_compile_features_ctx" />
+ <WordDetect String="target_compile_options" insensitive="true" attribute="Command" context="target_compile_options_ctx" />
+ <WordDetect String="target_include_directories" insensitive="true" attribute="Command" context="target_include_directories_ctx" />
+ <WordDetect String="target_link_libraries" insensitive="true" attribute="Command" context="target_link_libraries_ctx" />
+ <WordDetect String="target_sources" insensitive="true" attribute="Command" context="target_sources_ctx" />
+ <WordDetect String="try_compile" insensitive="true" attribute="Command" context="try_compile_ctx" />
+ <WordDetect String="try_run" insensitive="true" attribute="Command" context="try_run_ctx" />
+ <WordDetect String="ctest_build" insensitive="true" attribute="Command" context="ctest_build_ctx" />
+ <WordDetect String="ctest_configure" insensitive="true" attribute="Command" context="ctest_configure_ctx" />
+ <WordDetect String="ctest_coverage" insensitive="true" attribute="Command" context="ctest_coverage_ctx" />
+ <WordDetect String="ctest_empty_binary_directory" insensitive="true" attribute="Command" context="ctest_empty_binary_directory_ctx" />
+ <WordDetect String="ctest_memcheck" insensitive="true" attribute="Command" context="ctest_memcheck_ctx" />
+ <WordDetect String="ctest_read_custom_files" insensitive="true" attribute="Command" context="ctest_read_custom_files_ctx" />
+ <WordDetect String="ctest_run_script" insensitive="true" attribute="Command" context="ctest_run_script_ctx" />
+ <WordDetect String="ctest_sleep" insensitive="true" attribute="Command" context="ctest_sleep_ctx" />
+ <WordDetect String="ctest_start" insensitive="true" attribute="Command" context="ctest_start_ctx" />
+ <WordDetect String="ctest_submit" insensitive="true" attribute="Command" context="ctest_submit_ctx" />
+ <WordDetect String="ctest_test" insensitive="true" attribute="Command" context="ctest_test_ctx" />
+ <WordDetect String="ctest_update" insensitive="true" attribute="Command" context="ctest_update_ctx" />
+ <WordDetect String="ctest_upload" insensitive="true" attribute="Command" context="ctest_upload_ctx" />
<RegExpr attribute="Region Marker" context="RST Documentation" String="^#\[(=*)\[\.rst:" column="0" />
- <RegExpr attribute="Comment" context="Bracketed Comment" String="^#\[(=*)\[" column="0" />
+ <RegExpr attribute="Comment" context="Bracketed Comment" String="#\[(=*)\[" />
<DetectChar attribute="Comment" context="Comment" char="#" />
- <IncludeRules context="Detect Variables" />
- <RegExpr attribute="Macros" context="Macro" String="\w+" />
+ <DetectIdentifier attribute="User Function/Macro" context="User Function" />
+ <RegExpr attribute="@Variable Substitution" context="@VarSubst" String="@&id_re;@" lookAhead="true" />
+ <!-- Include keywords matching for language autocompleter work -->
+ <keyword attribute="Command" context="#stay" String="commands" />
</context>
- <!-- ATTENTION Do not change the context name! Or change a generation script accordingly -->
- <context attribute="Normal Text" lineEndContext="#stay" name="Detect More Builtin Variables">
- <!-- generated rules -->
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_ARCHIVE_OUTPUT_DIRECTORY_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_COMPILER_IS_GNU[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_DISABLE_FIND_PACKAGE_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_EXE_LINKER_FLAGS_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_LIBRARY_OUTPUT_DIRECTORY_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_MAP_IMPORTED_CONFIG_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_MODULE_LINKER_FLAGS_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_PDB_OUTPUT_DIRECTORY_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_POLICY_DEFAULT_CMP[0-9]+\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_POLICY_WARNING_CMP[0-9]+\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_PROJECT_[A-Za-z_][A-Za-z_0-9]*_INCLUDE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_RUNTIME_OUTPUT_DIRECTORY_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_SHARED_LINKER_FLAGS_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_STATIC_LINKER_FLAGS_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_USER_MAKE_RULES_OVERRIDE_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_XCODE_ATTRIBUTE_[A-Za-z_][A-Za-z_0-9]*\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_ARCHIVE_APPEND\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_ARCHIVE_CREATE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_ARCHIVE_FINISH\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_ABI\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_EXTERNAL_TOOLCHAIN\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_ID\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_LOADED\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_TARGET\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILER_VERSION\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_COMPILE_OBJECT\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_CREATE_SHARED_LIBRARY\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_CREATE_SHARED_MODULE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_CREATE_STATIC_LIBRARY\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_DEBUG\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_MINSIZEREL\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_RELEASE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_FLAGS_RELWITHDEBINFO\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_GHS_KERNEL_FLAGS_DEBUG\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_GHS_KERNEL_FLAGS_MINSIZEREL\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_GHS_KERNEL_FLAGS_RELEASE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_GHS_KERNEL_FLAGS_RELWITHDEBINFO\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IGNORE_EXTENSIONS\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_INCLUDE_DIRECTORIES\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_LINK_DIRECTORIES\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_IMPLICIT_LINK_LIBRARIES\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_INCLUDE_WHAT_YOU_USE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LIBRARY_ARCHITECTURE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LINKER_PREFERENCE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LINKER_PREFERENCE_PROPAGATES\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_LINK_EXECUTABLE\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_OUTPUT_EXTENSION\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_PLATFORM_ID\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_POSTFIX\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_SIMULATE_ID\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_SIMULATE_VERSION\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_SIZEOF_DATA_PTR\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_SOURCE_FILE_EXTENSIONS\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\bCMAKE_[A-Za-z_][A-Za-z_0-9]*_VISIBILITY_PRESET\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_BINARY_DIR\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_SOURCE_DIR\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_VERSION\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_VERSION_MAJOR\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_VERSION_MINOR\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_VERSION_PATCH\b" />
- <RegExpr attribute="Builtin CMake Variable" context="#stay" String="\b[A-Za-z_][A-Za-z_0-9]*_VERSION_TWEAK\b" />
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="break_ctx">
+ <DetectChar attribute="Normal Text" context="break_ctx_op" char="(" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Detect Builtin Variables">
- <keyword attribute="Builtin CMake Variable" context="#stay" String="cmake_vars" insensitive="false" />
- <IncludeRules context="Detect More Builtin Variables" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="break_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
</context>
- <context attribute="CMake Variable" lineEndContext="#pop" name="VarSubst">
- <IncludeRules context="Detect Builtin Variables" />
- <DetectIdentifier />
- <DetectChar attribute="CMake Variable" context="#pop" char="}" />
- <IncludeRules context="Detect Variables" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_host_system_information_ctx">
+ <DetectChar attribute="Normal Text" context="cmake_host_system_information_ctx_op" char="(" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variables">
- <RegExpr attribute="Environment Variable" context="#stay" String="\$ENV\{\s*[\w-]+\s*\}" />
- <Detect2Chars attribute="CMake Variable" context="VarSubst" char="$" char1="{" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_host_system_information_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="cmake_host_system_information_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="cmake_host_system_information_sargs" />
+ <IncludeRules context="User Function Args" />
</context>
- <context attribute="Generator Expression" lineEndContext="#pop#pop" name="DetectSimpleGEEnd">
- <DetectChar attribute="Generator Expression" context="#pop#pop" char="&gt;" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_minimum_required_ctx">
+ <DetectChar attribute="Normal Text" context="cmake_minimum_required_ctx_op" char="(" />
</context>
- <context attribute="Generator Expression" lineEndContext="#pop" name="Generator Expression">
- <IncludeRules context="Detect Generator Expressions" />
- <DetectChar attribute="Generator Expression" context="#pop" char="&gt;" />
- <keyword attribute="Generator Expression Keyword" context="DetectSimpleGEEnd" String="simple_generator_expr" insensitive="false" />
- <keyword attribute="Generator Expression Keyword" context="#stay" String="generator_expr" insensitive="false" />
- <IncludeRules context="Detect Variables" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_minimum_required_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="cmake_minimum_required_nargs" />
+ <IncludeRules context="User Function Args" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Detect Generator Expressions">
- <Detect2Chars attribute="Generator Expression" context="Generator Expression" char="$" char1="&lt;" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_parse_arguments_ctx">
+ <DetectChar attribute="Normal Text" context="cmake_parse_arguments_ctx_op" char="(" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Command" fallthroughContext="#pop" fallthrough="true">
- <DetectSpaces/>
- <DetectChar attribute="Normal Text" context="Command Args" char="(" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_parse_arguments_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="cmake_parse_arguments_nargs" />
+ <IncludeRules context="User Function Args" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Macro" fallthroughContext="#pop" fallthrough="true">
- <DetectSpaces/>
- <DetectChar attribute="Normal Text" context="Macro Args" char="(" />
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_policy_ctx">
+ <DetectChar attribute="Normal Text" context="cmake_policy_ctx_op" char="(" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Command Args">
- <keyword attribute="Special Args" context="#stay" String="special_args" />
- <keyword attribute="Special Args" context="#stay" String="extra_special_args" />
- <!-- NOTE Handle CMP<NNN> as a special arg -->
+ <context attribute="Normal Text" lineEndContext="#stay" name="cmake_policy_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="cmake_policy_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="cmake_policy_sargs" />
+ <IncludeRules context="User Function Args" />
+ <!-- NOTE Handle CMP<NNN> as a special arg of `cmake_policy` command -->
<RegExpr attribute="Special Args" context="#stay" String="\bCMP[0-9]+\b" />
- <keyword attribute="Properties" context="#stay" String="properties" />
- <keyword attribute="Properties" context="#stay" String="extra_properties" />
- <DetectChar attribute="Normal Text" context="Command Args" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="configure_file_ctx">
+ <DetectChar attribute="Normal Text" context="configure_file_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="configure_file_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="configure_file_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="configure_file_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="continue_ctx">
+ <DetectChar attribute="Normal Text" context="continue_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="continue_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="elseif_ctx">
+ <DetectChar attribute="Normal Text" context="elseif_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="elseif_ctx_op">
+ <DetectChar attribute="Normal Text" context="elseif_ctx_op_nested" char="(" />
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="elseif_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="elseif_ctx_op_nested">
+ <IncludeRules context="EndCmdPop" />
+ <keyword attribute="Named Args" context="#stay" String="elseif_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="else_ctx">
+ <DetectChar attribute="Normal Text" context="else_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="else_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endforeach_ctx">
+ <DetectChar attribute="Normal Text" context="endforeach_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endforeach_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endfunction_ctx">
+ <DetectChar attribute="Normal Text" context="endfunction_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endfunction_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endif_ctx">
+ <DetectChar attribute="Normal Text" context="endif_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endif_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endmacro_ctx">
+ <DetectChar attribute="Normal Text" context="endmacro_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endmacro_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endwhile_ctx">
+ <DetectChar attribute="Normal Text" context="endwhile_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="endwhile_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="execute_process_ctx">
+ <DetectChar attribute="Normal Text" context="execute_process_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="execute_process_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="execute_process_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="execute_process_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="file_ctx">
+ <DetectChar attribute="Normal Text" context="file_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="file_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="file_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="file_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_file_ctx">
+ <DetectChar attribute="Normal Text" context="find_file_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_file_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="find_file_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_library_ctx">
+ <DetectChar attribute="Normal Text" context="find_library_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_library_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="find_library_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_package_ctx">
+ <DetectChar attribute="Normal Text" context="find_package_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_package_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="find_package_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_path_ctx">
+ <DetectChar attribute="Normal Text" context="find_path_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_path_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="find_path_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_program_ctx">
+ <DetectChar attribute="Normal Text" context="find_program_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="find_program_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="find_program_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="foreach_ctx">
+ <DetectChar attribute="Normal Text" context="foreach_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="foreach_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="foreach_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="function_ctx">
+ <DetectChar attribute="Normal Text" context="function_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="function_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_cmake_property_ctx">
+ <DetectChar attribute="Normal Text" context="get_cmake_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_cmake_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Property" context="#stay" String="global-properties" />
+ <IncludeRules context="Detect More global-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_directory_property_ctx">
+ <DetectChar attribute="Normal Text" context="get_directory_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_directory_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="get_directory_property_nargs" />
+ <keyword attribute="Property" context="#stay" String="directory-properties" />
+ <IncludeRules context="Detect More directory-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_filename_component_ctx">
+ <DetectChar attribute="Normal Text" context="get_filename_component_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_filename_component_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="get_filename_component_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_property_ctx">
+ <DetectChar attribute="Normal Text" context="get_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="get_property_nargs" />
+ <keyword attribute="Property" context="#stay" String="cache-properties" />
+ <keyword attribute="Property" context="#stay" String="directory-properties" />
+ <IncludeRules context="Detect More directory-properties" />
+ <keyword attribute="Property" context="#stay" String="global-properties" />
+ <IncludeRules context="Detect More global-properties" />
+ <keyword attribute="Property" context="#stay" String="install-properties" />
+ <keyword attribute="Property" context="#stay" String="source-properties" />
+ <IncludeRules context="Detect More source-properties" />
+ <keyword attribute="Property" context="#stay" String="target-properties" />
+ <IncludeRules context="Detect More target-properties" />
+ <keyword attribute="Property" context="#stay" String="test-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="if_ctx">
+ <DetectChar attribute="Normal Text" context="if_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="if_ctx_op">
+ <DetectChar attribute="Normal Text" context="if_ctx_op_nested" char="(" />
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="if_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="if_ctx_op_nested">
+ <IncludeRules context="EndCmdPop" />
+ <keyword attribute="Named Args" context="#stay" String="if_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_ctx">
+ <DetectChar attribute="Normal Text" context="include_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="include_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_guard_ctx">
+ <DetectChar attribute="Normal Text" context="include_guard_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_guard_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="include_guard_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="list_ctx">
+ <DetectChar attribute="Normal Text" context="list_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="list_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="list_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="macro_ctx">
+ <DetectChar attribute="Normal Text" context="macro_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="macro_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="mark_as_advanced_ctx">
+ <DetectChar attribute="Normal Text" context="mark_as_advanced_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="mark_as_advanced_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="mark_as_advanced_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="math_ctx">
+ <DetectChar attribute="Normal Text" context="math_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="math_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="math_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="message_ctx">
+ <DetectChar attribute="Normal Text" context="message_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="message_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="message_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="option_ctx">
+ <DetectChar attribute="Normal Text" context="option_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="option_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="return_ctx">
+ <DetectChar attribute="Normal Text" context="return_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="return_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="separate_arguments_ctx">
+ <DetectChar attribute="Normal Text" context="separate_arguments_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="separate_arguments_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="separate_arguments_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_directory_properties_ctx">
+ <DetectChar attribute="Normal Text" context="set_directory_properties_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_directory_properties_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="set_directory_properties_nargs" />
+ <keyword attribute="Property" context="#stay" String="cache-properties" />
+ <keyword attribute="Property" context="#stay" String="directory-properties" />
+ <IncludeRules context="Detect More directory-properties" />
+ <keyword attribute="Property" context="#stay" String="global-properties" />
+ <IncludeRules context="Detect More global-properties" />
+ <keyword attribute="Property" context="#stay" String="install-properties" />
+ <keyword attribute="Property" context="#stay" String="source-properties" />
+ <IncludeRules context="Detect More source-properties" />
+ <keyword attribute="Property" context="#stay" String="target-properties" />
+ <IncludeRules context="Detect More target-properties" />
+ <keyword attribute="Property" context="#stay" String="test-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_property_ctx">
+ <DetectChar attribute="Normal Text" context="set_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="set_property_nargs" />
+ <keyword attribute="Property" context="#stay" String="cache-properties" />
+ <keyword attribute="Property" context="#stay" String="directory-properties" />
+ <IncludeRules context="Detect More directory-properties" />
+ <keyword attribute="Property" context="#stay" String="global-properties" />
+ <IncludeRules context="Detect More global-properties" />
+ <keyword attribute="Property" context="#stay" String="install-properties" />
+ <keyword attribute="Property" context="#stay" String="source-properties" />
+ <IncludeRules context="Detect More source-properties" />
+ <keyword attribute="Property" context="#stay" String="target-properties" />
+ <IncludeRules context="Detect More target-properties" />
+ <keyword attribute="Property" context="#stay" String="test-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_ctx">
+ <DetectChar attribute="Normal Text" context="set_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="set_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="set_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="site_name_ctx">
+ <DetectChar attribute="Normal Text" context="site_name_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="site_name_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="string_ctx">
+ <DetectChar attribute="Normal Text" context="string_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="string_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="string_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="unset_ctx">
+ <DetectChar attribute="Normal Text" context="unset_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="unset_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="unset_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="variable_watch_ctx">
+ <DetectChar attribute="Normal Text" context="variable_watch_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="variable_watch_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="while_ctx">
+ <DetectChar attribute="Normal Text" context="while_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="while_ctx_op">
+ <DetectChar attribute="Normal Text" context="while_ctx_op_nested" char="(" />
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="while_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="while_ctx_op_nested">
+ <IncludeRules context="EndCmdPop" />
+ <keyword attribute="Named Args" context="#stay" String="while_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_compile_definitions_ctx">
+ <DetectChar attribute="Normal Text" context="add_compile_definitions_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_compile_definitions_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_compile_options_ctx">
+ <DetectChar attribute="Normal Text" context="add_compile_options_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_compile_options_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_command_ctx">
+ <DetectChar attribute="Normal Text" context="add_custom_command_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_command_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="add_custom_command_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_target_ctx">
+ <DetectChar attribute="Normal Text" context="add_custom_target_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_custom_target_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="add_custom_target_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_definitions_ctx">
+ <DetectChar attribute="Normal Text" context="add_definitions_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_definitions_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_dependencies_ctx">
+ <DetectChar attribute="Normal Text" context="add_dependencies_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_dependencies_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_executable_ctx">
+ <DetectChar attribute="Normal Text" context="add_executable_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_executable_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="add_executable_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_library_ctx">
+ <DetectChar attribute="Normal Text" context="add_library_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_library_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="add_library_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_subdirectory_ctx">
+ <DetectChar attribute="Normal Text" context="add_subdirectory_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_subdirectory_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="add_subdirectory_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_test_ctx">
+ <DetectChar attribute="Normal Text" context="add_test_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="add_test_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="add_test_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="aux_source_directory_ctx">
+ <DetectChar attribute="Normal Text" context="aux_source_directory_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="aux_source_directory_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="build_command_ctx">
+ <DetectChar attribute="Normal Text" context="build_command_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="build_command_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="build_command_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="create_test_sourcelist_ctx">
+ <DetectChar attribute="Normal Text" context="create_test_sourcelist_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="create_test_sourcelist_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="create_test_sourcelist_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="define_property_ctx">
+ <DetectChar attribute="Normal Text" context="define_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="define_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="define_property_nargs" />
+ <keyword attribute="Property" context="#stay" String="cache-properties" />
+ <keyword attribute="Property" context="#stay" String="directory-properties" />
+ <IncludeRules context="Detect More directory-properties" />
+ <keyword attribute="Property" context="#stay" String="global-properties" />
+ <IncludeRules context="Detect More global-properties" />
+ <keyword attribute="Property" context="#stay" String="install-properties" />
+ <keyword attribute="Property" context="#stay" String="source-properties" />
+ <IncludeRules context="Detect More source-properties" />
+ <keyword attribute="Property" context="#stay" String="target-properties" />
+ <IncludeRules context="Detect More target-properties" />
+ <keyword attribute="Property" context="#stay" String="test-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="enable_language_ctx">
+ <DetectChar attribute="Normal Text" context="enable_language_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="enable_language_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="enable_language_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="enable_language_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="enable_testing_ctx">
+ <DetectChar attribute="Normal Text" context="enable_testing_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="enable_testing_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="export_ctx">
+ <DetectChar attribute="Normal Text" context="export_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="export_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="export_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="fltk_wrap_ui_ctx">
+ <DetectChar attribute="Normal Text" context="fltk_wrap_ui_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="fltk_wrap_ui_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_source_file_property_ctx">
+ <DetectChar attribute="Normal Text" context="get_source_file_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_source_file_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Property" context="#stay" String="source-properties" />
+ <IncludeRules context="Detect More source-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_target_property_ctx">
+ <DetectChar attribute="Normal Text" context="get_target_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_target_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Property" context="#stay" String="target-properties" />
+ <IncludeRules context="Detect More target-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_test_property_ctx">
+ <DetectChar attribute="Normal Text" context="get_test_property_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="get_test_property_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Property" context="#stay" String="test-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_directories_ctx">
+ <DetectChar attribute="Normal Text" context="include_directories_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_directories_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="include_directories_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_external_msproject_ctx">
+ <DetectChar attribute="Normal Text" context="include_external_msproject_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_external_msproject_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="include_external_msproject_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_regular_expression_ctx">
+ <DetectChar attribute="Normal Text" context="include_regular_expression_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="include_regular_expression_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="install_ctx">
+ <DetectChar attribute="Normal Text" context="install_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="install_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="install_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="install_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="link_directories_ctx">
+ <DetectChar attribute="Normal Text" context="link_directories_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="link_directories_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="link_libraries_ctx">
+ <DetectChar attribute="Normal Text" context="link_libraries_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="link_libraries_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="link_libraries_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="load_cache_ctx">
+ <DetectChar attribute="Normal Text" context="load_cache_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="load_cache_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="load_cache_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="project_ctx">
+ <DetectChar attribute="Normal Text" context="project_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="project_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="project_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="project_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="qt_wrap_cpp_ctx">
+ <DetectChar attribute="Normal Text" context="qt_wrap_cpp_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="qt_wrap_cpp_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="qt_wrap_ui_ctx">
+ <DetectChar attribute="Normal Text" context="qt_wrap_ui_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="qt_wrap_ui_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="remove_definitions_ctx">
+ <DetectChar attribute="Normal Text" context="remove_definitions_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="remove_definitions_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_source_files_properties_ctx">
+ <DetectChar attribute="Normal Text" context="set_source_files_properties_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_source_files_properties_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="set_source_files_properties_nargs" />
+ <keyword attribute="Property" context="#stay" String="source-properties" />
+ <IncludeRules context="Detect More source-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_target_properties_ctx">
+ <DetectChar attribute="Normal Text" context="set_target_properties_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_target_properties_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="set_target_properties_nargs" />
+ <keyword attribute="Property" context="#stay" String="target-properties" />
+ <IncludeRules context="Detect More target-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_tests_properties_ctx">
+ <DetectChar attribute="Normal Text" context="set_tests_properties_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="set_tests_properties_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="set_tests_properties_nargs" />
+ <keyword attribute="Property" context="#stay" String="test-properties" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="source_group_ctx">
+ <DetectChar attribute="Normal Text" context="source_group_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="source_group_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="source_group_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_compile_definitions_ctx">
+ <DetectChar attribute="Normal Text" context="target_compile_definitions_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_compile_definitions_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="target_compile_definitions_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_compile_features_ctx">
+ <DetectChar attribute="Normal Text" context="target_compile_features_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_compile_features_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="target_compile_features_nargs" />
+ <keyword attribute="Special Args" context="#stay" String="target_compile_features_sargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_compile_options_ctx">
+ <DetectChar attribute="Normal Text" context="target_compile_options_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_compile_options_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="target_compile_options_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_include_directories_ctx">
+ <DetectChar attribute="Normal Text" context="target_include_directories_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_include_directories_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="target_include_directories_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_link_libraries_ctx">
+ <DetectChar attribute="Normal Text" context="target_link_libraries_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_link_libraries_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="target_link_libraries_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_sources_ctx">
+ <DetectChar attribute="Normal Text" context="target_sources_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="target_sources_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="target_sources_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="try_compile_ctx">
+ <DetectChar attribute="Normal Text" context="try_compile_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="try_compile_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="try_compile_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="try_run_ctx">
+ <DetectChar attribute="Normal Text" context="try_run_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="try_run_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="try_run_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_build_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_build_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_build_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_build_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_configure_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_configure_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_configure_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_configure_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_coverage_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_coverage_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_coverage_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_coverage_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_empty_binary_directory_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_empty_binary_directory_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_empty_binary_directory_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_memcheck_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_memcheck_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_memcheck_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_memcheck_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_read_custom_files_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_read_custom_files_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_read_custom_files_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_run_script_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_run_script_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_run_script_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_run_script_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_sleep_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_sleep_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_sleep_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_start_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_start_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_start_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_start_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_submit_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_submit_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_submit_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_submit_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_test_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_test_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_test_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_test_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_update_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_update_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_update_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_update_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_upload_ctx">
+ <DetectChar attribute="Normal Text" context="ctest_upload_ctx_op" char="(" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="ctest_upload_ctx_op">
+ <IncludeRules context="EndCmdPop2" />
+ <keyword attribute="Named Args" context="#stay" String="ctest_upload_nargs" />
+ <IncludeRules context="User Function Args" />
+ </context>
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect More global-properties">
+ <RegExpr attribute="Property" context="#stay" String="\bFeatureSummary_&id_re;_DESCRIPTION\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect More directory-properties">
+ <RegExpr attribute="Property" context="#stay" String="\bINTERPROCEDURAL_OPTIMIZATION_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bVS_GLOBAL_SECTION_POST_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bVS_GLOBAL_SECTION_PRE_&id_re;\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect More target-properties">
+ <RegExpr attribute="Property" context="#stay" String="\bARCHIVE_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bARCHIVE_OUTPUT_NAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bCOMPILE_PDB_NAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bCOMPILE_PDB_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_OUTPUT_NAME\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_POSTFIX\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bEXCLUDE_FROM_DEFAULT_BUILD_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_IMPLIB_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LIBNAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LINK_DEPENDENT_LIBRARIES_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LINK_INTERFACE_LANGUAGES_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LINK_INTERFACE_LIBRARIES_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LINK_INTERFACE_MULTIPLICITY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_LOCATION_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_NO_SONAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_OBJECTS_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bIMPORTED_SONAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bINTERPROCEDURAL_OPTIMIZATION_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_CLANG_TIDY\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_COMPILER_LAUNCHER\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_CPPCHECK\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_CPPLINT\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_INCLUDE_WHAT_YOU_USE\b" />
+ <RegExpr attribute="Property" context="#stay" String="\b&id_re;_VISIBILITY_PRESET\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bLIBRARY_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bLIBRARY_OUTPUT_NAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bLINK_FLAGS_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bLINK_INTERFACE_LIBRARIES_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bLINK_INTERFACE_MULTIPLICITY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bLOCATION_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bMAP_IMPORTED_CONFIG_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bOSX_ARCHITECTURES_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bOUTPUT_NAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bPDB_NAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bPDB_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bRUNTIME_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bRUNTIME_OUTPUT_NAME_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bSTATIC_LIBRARY_FLAGS_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bVS_DOTNET_REFERENCE_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bVS_DOTNET_REFERENCEPROP_&id_re;_TAG_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bVS_GLOBAL_&id_re;\b" />
+ <RegExpr attribute="Property" context="#stay" String="\bXCODE_ATTRIBUTE_&id_re;\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect More source-properties">
+ <RegExpr attribute="Property" context="#stay" String="\bVS_CSHARP_&id_re;\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="EndCmdPop">
<DetectChar attribute="Normal Text" context="#pop" char=")" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="EndCmdPop2">
+ <DetectChar attribute="Normal Text" context="#pop#pop" char=")" />
+ </context>
+
+ <context attribute="User Function/Macro" lineEndContext="#stay" name="User Function">
+ <DetectChar attribute="Normal Text" context="User Function Opened" char="(" />
+ <IncludeRules context="EndCmdPop2" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="User Function Opened">
+ <IncludeRules context="EndCmdPop2" />
+ <IncludeRules context="User Function Args" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect Builtin Variables">
+ <keyword attribute="Builtin Variable" context="#stay" String="variables" insensitive="false" />
+ <IncludeRules context="Detect More Builtin Variables" />
+ <RegExpr attribute="Internal Name" context="#stay" String="\b_&id_re;\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect More Builtin Variables">
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_BINARY_DIR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_SOURCE_DIR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_MAJOR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_MINOR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_PATCH\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_TWEAK\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_ROOT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;__TRYRUN_OUTPUT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_CONSIDERED_CONFIGS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_CONSIDERED_VERSIONS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_COMPONENTS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_QUIETLY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_REQUIRED\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_REQUIRED_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION_COUNT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION_EXACT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION_MAJOR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION_MINOR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION_PATCH\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FIND_VERSION_TWEAK\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_FOUND\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_INCLUDE_DIRS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_LIBRARIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_LIBRARY_DIRS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_COUNT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\b&id_re;_VERSION_STRING\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_POSTFIX\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_MACHINE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_PREFIX\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ANDROID_TOOLCHAIN_SUFFIX\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ARCHIVE_APPEND\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ARCHIVE_CREATE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_ARCHIVE_FINISH\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CLANG_TIDY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_ABI\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_AR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_EXTERNAL_TOOLCHAIN\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_ID\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_LAUNCHER\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_LOADED\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_RANLIB\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_TARGET\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILER_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_COMPILE_OBJECT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CPPCHECK\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CPPLINT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CREATE_SHARED_LIBRARY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CREATE_SHARED_MODULE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_CREATE_STATIC_LIBRARY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_DEBUG\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_DEBUG_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_MINSIZEREL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_MINSIZEREL_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_RELEASE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_RELEASE_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_RELWITHDEBINFO\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_FLAGS_RELWITHDEBINFO_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_GHS_KERNEL_FLAGS_DEBUG\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_GHS_KERNEL_FLAGS_MINSIZEREL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_GHS_KERNEL_FLAGS_RELEASE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_GHS_KERNEL_FLAGS_RELWITHDEBINFO\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_IGNORE_EXTENSIONS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_IMPLICIT_INCLUDE_DIRECTORIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_IMPLICIT_LINK_DIRECTORIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_IMPLICIT_LINK_LIBRARIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_INCLUDE_WHAT_YOU_USE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_LIBRARY_ARCHITECTURE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_LINKER_PREFERENCE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_LINKER_PREFERENCE_PROPAGATES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_LINK_EXECUTABLE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_OUTPUT_EXTENSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_PLATFORM_ID\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SIMULATE_ID\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SIMULATE_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SIZEOF_DATA_PTR\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_SOURCE_FILE_EXTENSIONS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_STANDARD_INCLUDE_DIRECTORIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_STANDARD_LIBRARIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_&id_re;_VISIBILITY_PRESET\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_ARCHIVE_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_DISABLE_FIND_PACKAGE_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_EXE_LINKER_FLAGS_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_EXE_LINKER_FLAGS_&id_re;_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_INTERPROCEDURAL_OPTIMIZATION_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_LIBRARY_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_MAP_IMPORTED_CONFIG_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_MATCH_[0-9]+\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_MODULE_LINKER_FLAGS_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_MODULE_LINKER_FLAGS_&id_re;_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_PDB_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_POLICY_DEFAULT_CMP&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_POLICY_WARNING_CMP&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_PROJECT_&id_re;_INCLUDE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_RUNTIME_OUTPUT_DIRECTORY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_SHARED_LINKER_FLAGS_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_SHARED_LINKER_FLAGS_&id_re;_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_STATIC_LINKER_FLAGS_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_STATIC_LINKER_FLAGS_&id_re;_INIT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_USER_MAKE_RULES_OVERRIDE_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCMAKE_XCODE_ATTRIBUTE_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_&id_re;_COMPONENT_INSTALL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_ARCHIVE_&id_re;_FILE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_BINARY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_DEPENDS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_DESCRIPTION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_DISABLED\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_DISPLAY_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_GROUP\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_HIDDEN\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_REQUIRED\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_COMPONENT_&id_re;_DESCRIPTION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_FILE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_ARCHITECTURE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_BREAKS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_CONFLICTS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_CONTROL_EXTRA\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_CONTROL_STRICT_PERMISSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_DEPENDS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_ENHANCES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_PREDEPENDS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_PRIORITY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_PROVIDES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_RECOMMENDS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_REPLACES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_SECTION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_SHLIBDEPS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_SOURCE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_DEBIAN_&id_re;_PACKAGE_SUGGESTS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NSIS_&id_re;_INSTALL_DIRECTORY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_AUTHORS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_COPYRIGHT\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_DEPENDENCIES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_DEPENDENCIES_&id_re;_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_DESCRIPTION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_DESCRIPTION_SUMMARY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_HOMEPAGE_URL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_ICONURL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_LICENSEURL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_OWNERS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_RELEASE_NOTES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_TAGS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_TITLE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_&id_re;_PACKAGE_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_NUGET_PACKAGE_DEPENDENCIES_&id_re;_VERSION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_DEFAULT_DIR_PERMISSIONS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_DEFAULT_FILE_PERMISSIONS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_DEFAULT_GROUP\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_DEFAULT_USER\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_BUILD_SOURCE_DIRS_PREFIX\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_DEBUGINFO_FILE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_DEBUGINFO_PACKAGE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_FILE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_ARCHITECTURE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_AUTOPROV\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_AUTOREQ\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_AUTOREQPROV\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_CONFLICTS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_DESCRIPTION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_GROUP\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_NAME\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_OBSOLETES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_PREFIX\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_PROVIDES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_REQUIRES\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_REQUIRES_POST\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_REQUIRES_POSTUN\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_REQUIRES_PRE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_REQUIRES_PREUN\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_SUGGESTS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_SUMMARY\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_PACKAGE_URL\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_USER_FILELIST\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_&id_re;_USER_BINARY_SPECFILE\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_RPM_NO_&id_re;_INSTALL_PREFIX_RELOCATION\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_WIX_&id_re;_EXTENSIONS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_WIX_&id_re;_EXTRA_FLAGS\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bCPACK_WIX_PROPERTY_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bDOXYGEN_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bExternalData_CUSTOM_SCRIPT_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bExternalData_URL_ALGO_&id_re;_&id_re;\b" />
+ <RegExpr attribute="Builtin Variable" context="#stay" String="\bSWIG_MODULE_&id_re;_EXTRA_DEPS\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect Variable Substitutions">
+ <RegExpr attribute="Environment Variable Substitution" context="#stay" String="\$ENV\{\s*[\w-]+\s*\}" />
+ <Detect2Chars attribute="Variable Substitution" context="VarSubst" char="$" char1="{" />
+ <RegExpr attribute="@Variable Substitution" context="@VarSubst" String="@&id_re;@" lookAhead="true" />
+ </context>
+
+ <context attribute="Variable Substitution" lineEndContext="#pop" name="VarSubst">
<IncludeRules context="Detect Builtin Variables" />
- <IncludeRules context="Macro Args" />
+ <DetectIdentifier />
+ <DetectChar attribute="Variable Substitution" context="#pop" char="}" />
+ <IncludeRules context="Detect Variable Substitutions" />
</context>
- <context attribute="Normal Text" lineEndContext="#stay" name="Macro Args">
- <DetectChar attribute="Normal Text" context="Macro Args" char="(" />
- <DetectChar attribute="Normal Text" context="#pop" char=")" />
+
+ <context attribute="@Variable Substitution" lineEndContext="#pop" name="@VarSubst">
+ <DetectChar attribute="@Variable Substitution" context="VarSubst@" char="@" />
+ </context>
+
+ <context attribute="@Variable Substitution" lineEndContext="#pop#pop" name="VarSubst@">
+ <IncludeRules context="Detect Builtin Variables" />
+ <DetectIdentifier />
+ <DetectChar attribute="@Variable Substitution" context="#pop#pop" char="@" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="User Function Args">
+ <Detect2Chars attribute="Normal Text" context="#stay" char="\" char1="(" />
+ <Detect2Chars attribute="Normal Text" context="#stay" char="\" char1=")" />
<RegExpr attribute="Escapes" context="#stay" String="\\[&quot;$n\\]" />
<DetectChar attribute="Strings" context="String" char="&quot;" />
<RegExpr attribute="Strings" context="Bracketed String" String="\[(=*)\[" />
+ <RegExpr attribute="Comment" context="Bracketed Comment" String="#\[(=*)\[" />
<DetectChar attribute="Comment" context="Comment" char="#" />
<IncludeRules context="Detect Builtin Variables" />
- <IncludeRules context="Detect Variables" />
+ <IncludeRules context="Detect Variable Substitutions" />
+ <IncludeRules context="Detect Special Values" />
+ <IncludeRules context="Detect Aliased Targets" />
<IncludeRules context="Detect Generator Expressions" />
</context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect Special Values">
+ <RegExpr attribute="True Special Arg" context="#stay" String="\b(TRUE|ON)\b" />
+ <RegExpr attribute="False Special Arg" context="#stay" String="\b(FALSE|OFF|(&id_re;-)?NOTFOUND)\b" />
+ <RegExpr attribute="Special Args" context="#stay" String="\bCMP[0-9][0-9][0-9]\b" />
+ </context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect Aliased Targets">
+ <RegExpr attribute="Aliased Targets" context="#stay" String="\b&id_re;::&id_re;(::&id_re;)*\b" />
+ </context>
+
<context attribute="Comment" lineEndContext="#pop" name="Comment">
<LineContinue attribute="Comment" context="#pop" />
<IncludeRules context="##Alerts" />
<IncludeRules context="##Modelines" />
</context>
+
<context attribute="Comment" lineEndContext="#stay" name="RST Documentation" dynamic="true">
<RegExpr attribute="Region Marker" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" />
+ <IncludeRules context="##reStructuredText" />
</context>
+
<context attribute="Comment" lineEndContext="#stay" name="Bracketed Comment" dynamic="true">
- <RegExpr attribute="Comment" context="#pop" String="^#?\]%1\]" dynamic="true" column="0" />
+ <RegExpr attribute="Comment" context="#pop" String=".*\]%1\]" dynamic="true" />
<IncludeRules context="##Alerts" />
<IncludeRules context="##Modelines" />
</context>
+
<context attribute="Strings" lineEndContext="#stay" name="String">
<RegExpr attribute="Strings" context="#pop" String="&quot;(?=[ );]|$)" />
<RegExpr attribute="Escapes" context="#stay" String="\\[&quot;$nrt\\]" />
- <IncludeRules context="Detect Variables" />
+ <IncludeRules context="Detect Variable Substitutions" />
<IncludeRules context="Detect Generator Expressions" />
</context>
+
<context attribute="Strings" lineEndContext="#stay" name="Bracketed String" dynamic="true">
<RegExpr attribute="Strings" context="#pop" String="\]%1\]" dynamic="true" />
</context>
+
+ <context attribute="Normal Text" lineEndContext="#stay" name="Detect Generator Expressions">
+ <Detect2Chars attribute="Generator Expression" context="Generator Expression" char="$" char1="&lt;" />
+ </context>
+
+ <context attribute="Generator Expression" lineEndContext="#stay" name="Generator Expression">
+ <IncludeRules context="Detect Generator Expressions" />
+ <DetectChar attribute="Comment" context="Comment" char="#" />
+ <DetectChar attribute="Generator Expression" context="#pop" char="&gt;" />
+ <keyword attribute="Generator Expression Keyword" context="#stay" String="generator-expressions" insensitive="false" />
+ <IncludeRules context="Detect Aliased Targets" />
+ <IncludeRules context="Detect Variable Substitutions" />
+ </context>
+
</contexts>
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false" />
+ <itemData name="Command" defStyleNum="dsKeyword" spellChecking="false" />
+ <itemData name="User Function/Macro" defStyleNum="dsFunction" spellChecking="false" />
+ <itemData name="Property" defStyleNum="dsOthers" spellChecking="false" />
+ <itemData name="Aliased Targets" defStyleNum="dsBaseN" spellChecking="false" />
+ <itemData name="Named Args" defStyleNum="dsOthers" spellChecking="false" />
<itemData name="Special Args" defStyleNum="dsOthers" spellChecking="false" />
- <itemData name="Properties" defStyleNum="dsOthers" spellChecking="false" />
- <itemData name="Commands" defStyleNum="dsKeyword" spellChecking="false" />
- <itemData name="Third-Party Commands" defStyleNum="dsExtension" spellChecking="false" />
- <itemData name="Macros" defStyleNum="dsFunction" spellChecking="false" />
+ <itemData name="True Special Arg" defStyleNum="dsOthers" color="#30a030" selColor="#30a030" spellChecking="false" />
+ <itemData name="False Special Arg" defStyleNum="dsOthers" color="#e05050" selColor="#e05050" spellChecking="false" />
<itemData name="Strings" defStyleNum="dsString" spellChecking="true" />
- <itemData name="Escapes" defStyleNum="dsSpecialChar" spellChecking="false" />
- <itemData name="Builtin CMake Variable" defStyleNum="dsVariable" spellChecking="false" />
- <!-- TODO Rename to "Variable Substitution" -->
- <itemData name="CMake Variable" defStyleNum="dsVariable" spellChecking="false" />
- <!-- TODO Rename to "Environment Variable Substitution" -->
- <itemData name="Environment Variable" defStyleNum="dsFloat" spellChecking="false" />
+ <itemData name="Escapes" defStyleNum="dsChar" spellChecking="false" />
+ <itemData name="Builtin Variable" defStyleNum="dsDecVal" color="#c09050" selColor="#c09050" spellChecking="false" />
+ <itemData name="Variable Substitution" defStyleNum="dsDecVal" spellChecking="false" />
+ <itemData name="@Variable Substitution" defStyleNum="dsBaseN" spellChecking="false" />
+ <itemData name="Internal Name" defStyleNum="dsDecVal" color="#303030" selColor="#303030" spellChecking="false" />
+ <itemData name="Environment Variable Substitution" defStyleNum="dsFloat" spellChecking="false" />
<itemData name="Generator Expression Keyword" defStyleNum="dsKeyword" color="#b84040" selColor="#b84040" spellChecking="false" />
<itemData name="Generator Expression" defStyleNum="dsOthers" color="#b86050" selColor="#b86050" spellChecking="false" />
<itemData name="Comment" defStyleNum="dsComment" spellChecking="true" />
@@ -1310,3 +3706,6 @@
<keywords casesensitive="1" />
</general>
</language>
+
+<!-- kate: indent-width 2; tab-width 2; -->
+
diff --git a/src/share/3rdparty/generic-highlighter/ini.xml b/src/share/3rdparty/generic-highlighter/ini.xml
index dba0e204cb..34d9a7de6b 100644
--- a/src/share/3rdparty/generic-highlighter/ini.xml
+++ b/src/share/3rdparty/generic-highlighter/ini.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="2" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
+<language name="INI Files" section="Configuration" extensions="*.ini;*.pls;*.kcfgc" mimetype="" version="3" kateversion="2.4" author="Jan Janssen (medhefgo@web.de)" license="LGPL">
<highlighting>
<list name="keywords">
@@ -44,8 +44,6 @@
<Float attribute="Float" />
<Int attribute="Int" />
<keyword attribute="Keyword" String="keywords" />
- <RegExpr attribute="Comment" context="#pop" String=";.*$" />
- <RegExpr attribute="Comment" context="#pop" String="#.*$" />
</context>
<context name="Comment" attribute="Comment" lineEndContext="#pop">
diff --git a/src/share/3rdparty/generic-highlighter/perl.xml b/src/share/3rdparty/generic-highlighter/perl.xml
index f3786c40b5..a29a49b3e4 100644
--- a/src/share/3rdparty/generic-highlighter/perl.xml
+++ b/src/share/3rdparty/generic-highlighter/perl.xml
@@ -39,7 +39,7 @@
Enhance tr/// and y/// support.
-->
-<language name="Perl" version="5" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPLv2">
+<language name="Perl" version="6" kateversion="2.4" section="Scripts" extensions="*.pl;*.PL;*.pm;*.pl6;*.PL6;*.p6;*.pm6;" mimetype="application/x-perl;text/x-perl" priority="5" author="Anders Lund (anders@alweb.dk)" license="LGPLv2">
<highlighting>
<list name="keywords">
<item>if</item>
diff --git a/src/share/3rdparty/generic-highlighter/yacc.xml b/src/share/3rdparty/generic-highlighter/yacc.xml
index c8b3153218..6936c7a2de 100644
--- a/src/share/3rdparty/generic-highlighter/yacc.xml
+++ b/src/share/3rdparty/generic-highlighter/yacc.xml
@@ -10,6 +10,17 @@ This code is released under the LGPL as part of kdelibs/kate.
== UPDATE HISTORY ==
+2018-02-20 // Nibaldo González <nibgonz@gmail.com>
+
+ Fix '$' symbol, highlighted as 'dsError' by C++ (isocpp.xml).
+ Update syntax for Bison (3.0.4):
+ - Add declarations, directives in rules and the '@' variable.
+ - Allow a tag in '%union', declarations in multiple lines and
+ grammar declarations in the grammar rules section.
+ - The ';' char is not necessary to finish a rule. Allow '; |'
+ within rules.
+ Add mimetypes and extensions '*.ypp' & '*.y++'.
+
2007-10-01 // Sebastian Pipping <webmaster@hartwork.org>
Added: Extension "*.yy" for Bison
@@ -19,13 +30,9 @@ This code is released under the LGPL as part of kdelibs/kate.
YACC.XML 1.00 - First released.
-== TODO ==
-- Add a mime type (cannot find it !?)
-
-
========================================================================
-->
-<language name="Yacc/Bison" version="3" kateversion="2.4" section="Sources" extensions="*.y;*.yy" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
+<language name="Yacc/Bison" version="4" kateversion="2.4" section="Sources" extensions="*.y;*.yy;*.ypp;*.y++" mimetype="text/x-yacc;text/x-bison" priority="5" author="Jan Villat (jan.villat@net2000.ch)" license="LGPL">
<highlighting>
<contexts>
@@ -44,19 +51,35 @@ This code is released under the LGPL as part of kdelibs/kate.
<context name="Declarations" attribute="Normal Text" lineEndContext="#stay">
<IncludeRules context="Comment" />
- <StringDetect attribute="Directive" context="Union Start" String="%union" />
<Detect2Chars attribute="Content-Type Delimiter" context="Rules" char="%" char1="%" beginRegion="rules" endRegion="declarations" />
-
- <!-- not sure that strict yacc allows that ... but it is commonly used -->
+ <!-- Prologue Declarations -->
<Detect2Chars attribute="Content-Type Delimiter" context="C Declarations" char="%" char1="{" beginRegion="cdeclarations" column="0" />
-
+ <IncludeRules context="Grammar Declarations" />
+ <WordDetect attribute="Directive" context="Code-Symbols Start" String="%initial-action" />
+ <WordDetect attribute="Directive" context="Code-Symbols Start" String="%param" />
+ <WordDetect attribute="Directive" context="Code-Symbols Start" String="%lex-param" />
+ <WordDetect attribute="Directive" context="Code-Symbols Start" String="%parse-param" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%&lt;flag&gt;" />
+ <!-- Any word followed by '%' (End with ';' or '%') -->
<DetectChar attribute="Directive" context="Percent Command" char="%" />
+ </context>
+ <context name="Grammar Declarations" attribute="Normal Text" lineEndContext="#stay">
+ <WordDetect attribute="Directive" context="Union Start" String="%union" />
+ <WordDetect attribute="Directive" context="Union Start" String="%code" />
+ <WordDetect attribute="Directive" context="Code-Symbols Start" String="%destructor" />
+ <WordDetect attribute="Directive" context="Code-Symbols Start" String="%printer" />
</context>
<context name="Union Start" attribute="Normal Text" lineEndContext="#stay">
<IncludeRules context="Comment" />
<DetectSpaces />
<DetectChar attribute="Normal Text" context="Union In" char="{" beginRegion="union" />
+ <RegExpr attribute="Normal Text" context="#pop!Union Tag" String="[^\s\{](?=(\s|$|//))" />
+ </context>
+ <context name="Union Tag" attribute="Normal Text" lineEndContext="#stay">
+ <IncludeRules context="Comment" />
+ <DetectSpaces />
+ <DetectChar attribute="Normal Text" context="Union In" char="{" beginRegion="union" />
<RegExpr attribute="Alert" context="#pop" String="." />
</context>
<context name="Union In" attribute="Normal Text" lineEndContext="#stay">
@@ -70,39 +93,109 @@ This code is released under the LGPL as part of kdelibs/kate.
<IncludeRules context="##C++" />
</context>
+ <!-- '%'<decl> ('{' <Code-Symbols In> '}')+ <Percent Command In> [';'] -->
+ <context name="Code-Symbols Start" attribute="Normal Text" lineEndContext="#stay">
+ <IncludeRules context="Comment" />
+ <DetectSpaces />
+ <DetectChar attribute="Normal Text" context="Code-Symbols In" char="{" beginRegion="code-symbols" />
+ <RegExpr attribute="Alert" context="#pop" String="." />
+ </context>
+ <context name="Code-Symbols In" attribute="Normal Text" lineEndContext="#stay">
+ <DetectChar attribute="Normal Text" context="#pop#pop!Code-Symbols End" char="}" endRegion="code-symbols" />
+ <DetectChar attribute="Normal Text" context="Code-Symbols InIn" char="{" />
+ <IncludeRules context="Symbol-Variable" />
+ <IncludeRules context="##C++" />
+ </context>
+ <context name="Code-Symbols InIn" attribute="Normal Text" lineEndContext="#stay">
+ <DetectChar attribute="Normal Text" context="Code-Symbols InIn" char="{" />
+ <DetectChar attribute="Normal Text" context="#pop" char="}" />
+ <IncludeRules context="Symbol-Variable" />
+ <IncludeRules context="##C++" />
+ </context>
+ <context name="Code-Symbols End" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop!Percent Command In">
+ <IncludeRules context="Comment" />
+ <DetectSpaces />
+ <DetectChar attribute="Normal Text" context="#pop" char=";" lookAhead="true" />
+ <DetectChar attribute="Normal Text" context="Code-Symbols In" char="{" beginRegion="code-symbols" />
+ </context>
+
<context name="Rules" attribute="Rule" lineEndContext="#stay">
<IncludeRules context="Comment" />
<Detect2Chars attribute="Content-Type Delimiter" context="User Code" char="%" char1="%" beginRegion="code" endRegion="rules" />
<DetectChar attribute="Normal Text" context="Rule In" char=":" beginRegion="rule" />
+ <DetectChar attribute="Rule" context="Grammar Declaration Start" char="%" lookAhead="true" />
</context>
<context name="Rule In" attribute="Definition" lineEndContext="#stay">
<IncludeRules context="Comment" />
- <DetectChar attribute="Normal Text" context="#pop" char=";" endRegion="rule" />
+ <DetectChar attribute="Normal Text" context="Rule End" char=";" endRegion="rule" />
<DetectChar attribute="Normal Text" context="Normal C Bloc" char="{" beginRegion="bloc" />
<DetectChar attribute="Normal Text" context="#stay" char="|" />
<IncludeRules context="StringOrChar" />
+ <RegExpr attribute="Directive" context="#stay" String="%\?(?=\{)" />
+ <WordDetect attribute="Directive" context="#stay" String="%empty" />
+ <WordDetect attribute="Directive" context="#stay" String="%prec" />
+ <WordDetect attribute="Directive" context="#stay" String="%dprec" />
+ <WordDetect attribute="Directive" context="#stay" String="%merge" />
+
+ <!-- Finish rule without the ';' character (see the 'rhses.1' rule in the 'src/parse-gram.y' file, from the Bison source) -->
+ <RegExpr attribute="Open Rule" context="#pop" String="[\w\-\.](?=[\w\-\.]*:)" column="0" endRegion="rule" />
+ <Detect2Chars attribute="Content-Type Delimiter" context="#pop" char="%" char1="%" lookAhead="true" firstNonSpace="true" endRegion="rule" />
+ <RegExpr attribute="Directive" context="#pop" String="%(union|code|destructor|printer|start|(no\-)?default\-prec|nterm|token|type|left|right|nonassoc|precedence)\b" lookAhead="true" column="0" endRegion="rule" />
+ </context>
+ <!-- The Bison parser allows to have ';' followed by '|', without the rule ending.
+ The problem here is that the ';' char has endRegion="rule" (although it is not very relevant). -->
+ <context name="Rule End" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop#pop">
+ <DetectSpaces />
+ <DetectChar attribute="Normal Text" context="#stay" char=";" />
+ <DetectChar attribute="Normal Text" context="#pop" char="|" />
+ <IncludeRules context="Comment" />
+ </context>
+
+ <context name="Grammar Declaration Start" attribute="Normal Text" lineEndContext="#stay">
+ <!-- In the rules section, only highlighting exact declarations -->
+ <IncludeRules context="Grammar Declarations" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%start" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%default-prec" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%no-default-prec" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%nterm" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%token" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%type" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%left" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%right" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%nonassoc" />
+ <WordDetect attribute="Directive" context="Percent Command In" String="%precedence" />
+
+ <DetectChar attribute="Rule" context="#pop" char="%" /> <!-- End when there is an invalid declaration -->
+ <DetectChar attribute="Normal Text" context="#pop" char=";" />
+ <IncludeRules context="Comment" />
+ <DetectSpaces />
+ <RegExpr attribute="Alert" context="#pop" String=".+" />
</context>
<context name="User Code" attribute="Normal Text" lineEndContext="#stay">
<IncludeRules context="##C++" />
</context>
- <context name="Percent Command" attribute="Directive" lineEndContext="#pop">
+ <context name="Percent Command" attribute="Directive" lineEndContext="#pop!Percent Command In">
<IncludeRules context="Comment" />
- <RegExpr attribute="Normal Text" context="Percent Command In" String="\W" lookAhead="true" />
+ <RegExpr attribute="Normal Text" context="#pop!Percent Command In" String="[^\w\-]" lookAhead="true" />
</context>
- <context name="Percent Command In" attribute="Normal Text" lineEndContext="#pop#pop">
+ <context name="Percent Command In" attribute="Normal Text" lineEndContext="#stay">
+ <!-- This can be applied to multiple lines -->
+ <DetectChar attribute="Normal Text" context="#pop" char=";" lookAhead="true" />
+ <DetectChar attribute="Normal Text" context="#pop" char="%" lookAhead="true" firstNonSpace="true" />
+ <Detect2Chars attribute="Normal Text" context="#pop" char="%" char1="%" lookAhead="true" />
<IncludeRules context="StringOrChar" />
<DetectChar attribute="Data Type" context="PC type" char="&lt;" />
+ <IncludeRules context="Comment" />
</context>
- <context name="PC type" attribute="Data Type" lineEndContext="#pop#pop#pop">
+ <context name="PC type" attribute="Data Type" lineEndContext="#pop#pop">
<DetectChar attribute="Data Type" context="#pop" char="&gt;" />
</context>
<context name="Comment" attribute="Comment" lineEndContext="#stay">
<Detect2Chars attribute="Comment" context="CommentStar" char="/" char1="*" />
- <!-- not sure that strict yacc allows that ... but I saw it in some sources ... -->
<Detect2Chars attribute="Comment" context="CommentSlash" char="/" char1="/" />
</context>
<context name="CommentStar" attribute="Comment" lineEndContext="#stay">
@@ -128,15 +221,20 @@ This code is released under the LGPL as part of kdelibs/kate.
<context name="Normal C Bloc" attribute="Normal Text" lineEndContext="#stay">
<DetectChar attribute="Normal Text" context="Normal C Bloc" char="{" beginRegion="bloc" />
<DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="bloc" />
+ <IncludeRules context="Symbol-Variable" />
<IncludeRules context="##C++" />
+ </context>
+ <context name="Symbol-Variable" attribute="Normal Text" lineEndContext="#stay">
<DetectChar attribute="Directive" context="Dol" char="$" />
+ <RegExpr attribute="Directive" context="#stay" String="@(\$?)(\d+|[A-Za-z_]\w*)?" />
</context>
<context name="Dol" attribute="Normal Text" fallthrough="true" fallthroughContext="DolEnd" lineEndContext="#stay">
<RegExpr attribute="Data Type" context="DolEnd" String="&lt;[^&gt;]+&gt;" />
</context>
- <context name="DolEnd" attribute="Normal Text" lineEndContext="#stay">
- <RegExpr attribute="Directive" context="#pop#pop" String="\d+" />
+ <context name="DolEnd" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop#pop">
+ <RegExpr attribute="Directive" context="#pop#pop" String="@?\d+" />
<DetectChar attribute="Directive" context="#pop#pop" char="$" />
+ <DetectIdentifier attribute="Directive" context="#pop#pop" />
</context>
</contexts>
@@ -147,6 +245,7 @@ This code is released under the LGPL as part of kdelibs/kate.
<itemData name="Content-Type Delimiter" defStyleNum="dsBaseN" bold="1" />
<itemData name="Directive" defStyleNum="dsKeyword"/>
<itemData name="Rule" defStyleNum="dsString" />
+ <itemData name="Open Rule" defStyleNum="dsString" bold="1" />
<itemData name="Backslash Code" defStyleNum="dsString" bold="1" />
<itemData name="Alert" defStyleNum="dsAlert" />
<itemData name="String" defStyleNum="dsString"/>
@@ -158,6 +257,7 @@ This code is released under the LGPL as part of kdelibs/kate.
<general>
<comments>
<comment name="multiLine" start="/*" end="*/" />
+ <comment name="singleLine" start="//" />
</comments>
</general>
</language>
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 29420ab4698ad45de994cf367b94f23ddc87420
+Subproject 872e4b883d7732c46e1e5d32b60ce698862e5da
diff --git a/src/tools/clangbackend/source/clangbackend_global.h b/src/tools/clangbackend/source/clangbackend_global.h
index 2d2535e12c..ff25ddeb81 100644
--- a/src/tools/clangbackend/source/clangbackend_global.h
+++ b/src/tools/clangbackend/source/clangbackend_global.h
@@ -51,4 +51,9 @@ enum class PreferredTranslationUnit
# define IS_LIMITSKIPFUNCTIONBODIESTOPREAMBLE_SUPPORTED
#endif
+// CLANG-UPGRADE-CHECK: Remove IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED once we require clang >= 7.0
+#if defined(CINDEX_VERSION_HAS_SKIPWARNINGSFROMINCLUDEDFILES_BACKPORTED) || CINDEX_VERSION_MINOR >= 46
+# define IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED
+#endif
+
} // namespace ClangBackEnd
diff --git a/src/tools/clangbackend/source/clangtranslationunit.cpp b/src/tools/clangbackend/source/clangtranslationunit.cpp
index aa36dea875..017abdd98f 100644
--- a/src/tools/clangbackend/source/clangtranslationunit.cpp
+++ b/src/tools/clangbackend/source/clangtranslationunit.cpp
@@ -237,17 +237,6 @@ static bool isHeaderErrorDiagnostic(const Utf8String &mainFilePath, const Diagno
return isCritical && diagnostic.location().filePath() != mainFilePath;
}
-static bool isIgnoredHeaderErrorDiagnostic(const Diagnostic &diagnostic)
-{
- // FIXME: This diagnostic can appear if e.g. a main file includes a -isystem header and then the
- // header is opened in the editor - the provided unsaved file for the newly opened editor
- // overrides the file from the preamble. In this case, clang uses the version from the preamble
- // and changes in the header are not reflected in the main file. Typically that's not a problem
- // because only non-project headers are opened as -isystem headers.
- return diagnostic.text().endsWith(
- Utf8StringLiteral("from the precompiled header has been overridden"));
-}
-
void TranslationUnit::extractDiagnostics(DiagnosticContainer &firstHeaderErrorDiagnostic,
QVector<DiagnosticContainer> &mainFileDiagnostics) const
{
@@ -257,9 +246,7 @@ void TranslationUnit::extractDiagnostics(DiagnosticContainer &firstHeaderErrorDi
bool hasFirstHeaderErrorDiagnostic = false;
for (const Diagnostic &diagnostic : diagnostics()) {
- if (!hasFirstHeaderErrorDiagnostic
- && isHeaderErrorDiagnostic(m_filePath, diagnostic)
- && !isIgnoredHeaderErrorDiagnostic(diagnostic)) {
+ if (!hasFirstHeaderErrorDiagnostic && isHeaderErrorDiagnostic(m_filePath, diagnostic)) {
hasFirstHeaderErrorDiagnostic = true;
firstHeaderErrorDiagnostic = diagnostic.toDiagnosticContainer();
}
diff --git a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
index ac21ebb72a..733c8f980e 100644
--- a/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
+++ b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
@@ -181,6 +181,9 @@ uint TranslationUnitUpdater::defaultParseOptions()
| CXTranslationUnit_SkipFunctionBodies
| CXTranslationUnit_LimitSkipFunctionBodiesToPreamble
#endif
+#ifdef IS_SKIPWARNINGSFROMINCLUDEDFILES_SUPPORTED
+ | CXTranslationUnit_IgnoreNonErrorsFromIncludedFiles
+#endif
| CXTranslationUnit_IncludeBriefCommentsInCodeCompletion
| CXTranslationUnit_DetailedPreprocessingRecord
| CXTranslationUnit_KeepGoing;
diff --git a/src/tools/clangbackend/source/fulltokeninfo.cpp b/src/tools/clangbackend/source/fulltokeninfo.cpp
index d539138ce9..283798d0be 100644
--- a/src/tools/clangbackend/source/fulltokeninfo.cpp
+++ b/src/tools/clangbackend/source/fulltokeninfo.cpp
@@ -106,7 +106,6 @@ static Utf8String getPropertyType(const CXSourceLocation &cxLocation,
CXTranslationUnit cxTranslationUnit,
uint propertyPosition)
{
-#if defined(CINDEX_VERSION_HAS_GETFILECONTENTS_BACKPORTED) || CINDEX_VERSION_MINOR >= 47
// Extract property type from the source code
CXFile cxFile;
uint offset;
@@ -123,12 +122,6 @@ static Utf8String getPropertyType(const CXSourceLocation &cxLocation,
Utils::unequalTo(' '));
return Utf8String(typeStart, static_cast<int>(&(*typeEnd) + 1 - typeStart));
-#else
- Q_UNUSED(cxLocation)
- Q_UNUSED(cxTranslationUnit)
- Q_UNUSED(propertyPosition)
- return Utf8String();
-#endif
}
void FullTokenInfo::updatePropertyData()
diff --git a/src/tools/clangbackend/source/tokenprocessor.h b/src/tools/clangbackend/source/tokenprocessor.h
index 4c6fbd995d..aeac7dc01c 100644
--- a/src/tools/clangbackend/source/tokenprocessor.h
+++ b/src/tools/clangbackend/source/tokenprocessor.h
@@ -159,6 +159,10 @@ QVector<TokenInfoContainer> TokenProcessor<FullTokenInfo>::toTokenInfoContainers
if (it->m_extraInfo.declaration && !it->hasMainType(HighlightingType::LocalVariable)
&& it->m_originalCursor != token.m_originalCursor
&& it->m_extraInfo.cursorRange.contains(tokenStart)) {
+ if (token.m_originalCursor.lexicalParent() != it->m_originalCursor
+ && !token.hasMainType(HighlightingType::QtProperty)) {
+ continue;
+ }
token.m_extraInfo.lexicalParentIndex = std::distance(it, tokens.rend()) - 1;
break;
}
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e71331e4ee..66fa8dfc87 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3376,12 +3376,6 @@
width="16"
id="rect3817-2-9-1-9-6-2"
style="fill:#ffffff" />
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path4784"
- d="m 210,595 -2.5,2.5 -2.5,-2.5 z"
- style="fill:#000000;fill-opacity:1;stroke:none" />
<polygon
transform="translate(93.999999,334)"
id="polygon4959-9"
@@ -6012,6 +6006,26 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccccc" />
</g>
+ <g
+ id="src/libs/utils/images/toolbuttonexpandarrow"
+ style="display:inline"
+ clip-path="url(#clipPath4845-7)"
+ transform="translate(-131,-32)">
+ <use
+ x="0"
+ y="0"
+ xlink:href="#backgroundRect"
+ id="use5933-0-9"
+ width="100%"
+ height="100%"
+ transform="translate(211,148)" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path4784-17"
+ d="m 210,595 -2.5,2.5 -2.5,-2.5 z"
+ style="fill:#000000;fill-opacity:1;stroke:none" />
+ </g>
</g>
<g
inkscape:groupmode="layer"
diff --git a/tests/manual/debugger/cli-io/main.cpp b/tests/manual/debugger/cli-io/main.cpp
index 831b37b5a7..830663a666 100644
--- a/tests/manual/debugger/cli-io/main.cpp
+++ b/tests/manual/debugger/cli-io/main.cpp
@@ -36,9 +36,11 @@ int main(int argc, char *argv[])
QString qs("I'm a QString");
std::string stds("I'm a std::string");
char c[] = "I'm a char c[]";
+ int i = 1892;
qDebug() << "This is a QString:" << qs;
std::cout << "This is a std::string: " << stds << std::endl;
std::cout << "This is a char c[]: " << c << std::endl;
+ std::cout << "This is an int: " << i << std::endl;
qDebug() << "This is QDebug";
std::cout << "This is stdout" << std::endl;
diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py
index e648311f76..09b3af6ae7 100644
--- a/tests/system/shared/editor_utils.py
+++ b/tests/system/shared/editor_utils.py
@@ -333,7 +333,7 @@ def validateSearchResult(expectedCount):
resultTreeView.scrollTo(chIndex)
text = str(chIndex.data()).rstrip('\r')
rect = resultTreeView.visualRect(chIndex)
- doubleClick(resultTreeView, rect.x+5, rect.y+5, 0, Qt.LeftButton)
+ doubleClick(resultTreeView, rect.x+50, rect.y+5, 0, Qt.LeftButton)
editor = getEditorForFileSuffix(itemText)
if not waitFor("lineUnderCursor(editor) == text", 2000):
test.warning("Jumping to search result '%s' is pretty slow." % text)
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 5219d675dd..313ace186c 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -541,7 +541,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ")
result = []
if 'Desktop' in supports:
- if version == None or version < "5.0":
+ if (version == None or version < "5.0") and templateName != "Qt Widgets Application":
result.append(Targets.DESKTOP_4_8_7_DEFAULT)
if platform.system() in ("Linux", "Darwin"):
result.append(Targets.EMBEDDED_LINUX)
diff --git a/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv b/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv
index b26671f2ac..8e6d9d64ea 100644
--- a/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv
+++ b/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv
@@ -25,3 +25,4 @@
"VS140COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 14.0" "x86,amd64,x86_amd64,x86_arm,amd64_arm,amd64_x86" "x86,amd64,x86_amd64,x86_arm,amd64_arm,amd64_x86" "false" "..\IDE\devenv.exe"
"ProgramFiles" "Microsoft Visual C++ Build Tools" "vcbuildtools.bat" "Microsoft Visual C++ Build Tools" "x86,x64,x86_arm,x64_arm" "x86,amd64,x86_arm,amd64_arm" "false" ""
"ProgramFiles(x86)" "Microsoft Visual C++ Build Tools" "vcbuildtools.bat" "Microsoft Visual C++ Build Tools" "x86,x64,x86_arm,x64_arm" "x86,amd64,x86_arm,amd64_arm" "false" ""
+"ProgramFiles(x86)" "Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build" "vcvarsall.bat" "Microsoft Visual C++ Compiler 15.0" "x86,amd64_x86,amd64,x86_amd64" "x86,amd64_x86,amd64,x86_amd64" "false" ""
diff --git a/tests/system/suite_tools/tst_codepasting/test.py b/tests/system/suite_tools/tst_codepasting/test.py
index 023d785312..998b36bf84 100644
--- a/tests/system/suite_tools/tst_codepasting/test.py
+++ b/tests/system/suite_tools/tst_codepasting/test.py
@@ -42,6 +42,19 @@ def invalidPasteId(protocol):
else:
return -1
+def closeHTTPStatusAndPasterDialog(protocol, pasterDialog):
+ mBoxStr = "{type='QMessageBox' unnamed='1' visible='1' windowTitle?='%s *'}" % protocol
+ mBox = waitForObject(mBoxStr, 1000)
+ text = str(mBox.text)
+ # close message box and paster window
+ clickButton("{type='QPushButton' text='Cancel' visible='1' window=%s}" % mBoxStr)
+ clickButton("{type='QPushButton' text='Cancel' visible='1' window='%s'}" % pasterDialog)
+ if 'Service Unavailable' in text:
+ test.warning(text)
+ return True
+ test.log("Closed dialog without expected error.", text)
+ return False
+
def pasteFile(sourceFile, protocol):
def resetFiles():
clickButton(waitForObject(":*Qt Creator.Clear_QToolButton"))
@@ -71,12 +84,17 @@ def pasteFile(sourceFile, protocol):
# make sure to read all former errors (they won't get read twice)
aut.readStderr()
clickButton(waitForObject(":Send to Codepaster.Paste_QPushButton"))
- outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")
- waitFor("'https://' in str(outputWindow.plainText)", 20000)
try:
+ outputWindow = waitForObject(":Qt Creator_Core::OutputWindow")
+ waitFor("'https://' in str(outputWindow.plainText)", 20000)
output = str(outputWindow.plainText).splitlines()[-1]
except:
output = ""
+ try:
+ if closeHTTPStatusAndPasterDialog(protocol, ':Send to Codepaster_CodePaster::PasteView'):
+ raise Exception(serverProblems)
+ except:
+ pass
stdErrOut = aut.readStderr()
match = re.search("^%s protocol error: (.*)$" % protocol, stdErrOut, re.MULTILINE)
if match:
@@ -102,7 +120,14 @@ def fetchSnippet(protocol, description, pasteId, skippedPasting):
foundSnippet = True
invokeMenuItem("Tools", "Code Pasting", "Fetch Snippet...")
selectFromCombo(":PasteSelectDialog.protocolBox_QComboBox", protocol)
- pasteModel = waitForObject(":PasteSelectDialog.listWidget_QListWidget").model()
+ try:
+ pasteModel = waitForObject(":PasteSelectDialog.listWidget_QListWidget").model()
+ except:
+ try:
+ if closeHTTPStatusAndPasterDialog(protocol, ':PasteSelectDialog_CodePaster::PasteSelectDialog'):
+ return -1
+ except:
+ pass
waitFor("pasteModel.rowCount() > 1", 20000)
if (not skippedPasting and not protocol == NAME_PBCA
and not any(map(lambda str:pasteId in str, dumpItems(pasteModel)))):