feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd
This commit is contained in:
Eike Ziller
2022-07-07 13:28:17 +02:00
parent 1431452069 777ae87779
commit f950a5d86c
122 changed files with 983 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build_cmake.yml vendored
View File

@@ -585,7 +585,6 @@ jobs:
execute_process(COMMAND ccache -s) execute_process(COMMAND ccache -s)
- name: Run tests - name: Run tests
if: matrix.config.artifact == 'running-of-tests-is-disabled'
shell: cmake -P {0} shell: cmake -P {0}
run: | run: |
include(ProcessorCount) include(ProcessorCount)
@@ -598,7 +597,7 @@ jobs:
endif() endif()
execute_process( execute_process(
COMMAND ctest -j ${N} --timeout 5 COMMAND ctest -j ${N} --timeout 60 --label-exclude exclude_from_precheck --exclude-regex tst_perfdata
WORKING_DIRECTORY build/build WORKING_DIRECTORY build/build
RESULT_VARIABLE result RESULT_VARIABLE result
OUTPUT_VARIABLE output OUTPUT_VARIABLE output

28
cmake/QtCreatorAPI.cmake
View File

@@ -807,10 +807,10 @@ function(extend_qtc_executable name)
endfunction() endfunction()
function(add_qtc_test name) function(add_qtc_test name)
cmake_parse_arguments(_arg "GTEST;MANUALTEST" "TIMEOUT" cmake_parse_arguments(_arg "GTEST;MANUALTEST;EXCLUDE_FROM_PRECHECK" "TIMEOUT"
"DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;SKIP_PCH;CONDITION" ${ARGN}) "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;SKIP_PCH;CONDITION" ${ARGN})
if ($_arg_UNPARSED_ARGUMENTS) if (${_arg_UNPARSED_ARGUMENTS})
message(FATAL_ERROR "add_qtc_test had unparsed arguments!") message(FATAL_ERROR "add_qtc_test had unparsed arguments!")
endif() endif()
@@ -872,6 +872,9 @@ function(add_qtc_test name)
if (NOT _arg_GTEST AND NOT _arg_MANUALTEST) if (NOT _arg_GTEST AND NOT _arg_MANUALTEST)
add_test(NAME ${name} COMMAND ${name}) add_test(NAME ${name} COMMAND ${name})
if (_arg_EXCLUDE_FROM_PRECHECK)
set_tests_properties(${name} PROPERTIES LABELS exclude_from_precheck)
endif()
if (DEFINED _arg_TIMEOUT) if (DEFINED _arg_TIMEOUT)
set(timeout_option TIMEOUT ${_arg_TIMEOUT}) set(timeout_option TIMEOUT ${_arg_TIMEOUT})
else() else()
@@ -881,17 +884,32 @@ function(add_qtc_test name)
endif() endif()
endfunction() endfunction()
function(finalize_qtc_gtest test_name exclude_sources_regex) function(finalize_qtc_gtest test_name)
if (NOT TARGET ${test_name}) if (NOT TARGET ${test_name})
return() return()
endif() endif()
cmake_parse_arguments(_arg "EXCLUDE_ALL_FROM_PRECHECK" "EXCLUDE_SOURCES_REGEX"
"EXCLUDE_FROM_PRECHECK" ${ARGN})
if (${_arg_UNPARSED_ARGUMENTS})
message(FATAL_ERROR "finalize_qtc_gtest had unparsed arguments!")
endif()
get_target_property(test_sources ${test_name} SOURCES) get_target_property(test_sources ${test_name} SOURCES)
if (exclude_sources_regex) if (_arg_EXCLUDE_SOURCES_REGEX)
list(FILTER test_sources EXCLUDE REGEX "${exclude_sources_regex}") list(FILTER test_sources EXCLUDE REGEX "${_arg_EXCLUDE_SOURCES_REGEX}")
endif() endif()
include(GoogleTest) include(GoogleTest)
gtest_add_tests(TARGET ${test_name} SOURCES ${test_sources} TEST_LIST test_list SKIP_DEPENDENCY) gtest_add_tests(TARGET ${test_name} SOURCES ${test_sources} TEST_LIST test_list SKIP_DEPENDENCY)
if(_arg_EXCLUDE_ALL_FROM_PRECHECK)
set_tests_properties(${test_list}
PROPERTIES LABELS exclude_from_precheck)
elseif(_arg_EXCLUDE_FROM_PRECHECK)
set_tests_properties(${_arg_EXCLUDE_FROM_PRECHECK}
PROPERTIES LABELS exclude_from_precheck)
endif()
foreach(test IN LISTS test_list) foreach(test IN LISTS test_list)
finalize_test_setup(${test}) finalize_test_setup(${test})
endforeach() endforeach()

3
coin/instructions/test.yaml
View File

@@ -3,8 +3,7 @@ instructions:
- type: ChangeDirectory - type: ChangeDirectory
directory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build" directory: "{{.AgentWorkingDir}}/qt-creator/qt-creator_build/build"
- type: ExecuteCommand - type: ExecuteCommand
command: "ctest -j 4 --timeout 60 --output-on-failure" command: "ctest -j 4 --timeout 60 --output-on-failure --label-exclude exclude_from_precheck --exclude-regex tst_perfdata"
maxTimeInSeconds: 600 maxTimeInSeconds: 600
maxTimeBetweenOutput: 600 maxTimeBetweenOutput: 600
userMessageOnFailure: "Failed to run tests, check logs" userMessageOnFailure: "Failed to run tests, check logs"
ignoreExitCode: true

BIN
doc/qtcreator/images/coco-coveragebrowser-load-execution-report.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
doc/qtcreator/images/qtcreator-coco.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
doc/qtcreator/images/qtcreator-code-style-clang-format.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/qtcreator/images/qtcreator-kits-add.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
doc/qtcreator/images/qtcreator-kits.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
doc/qtcreator/images/qtcreator-options-android-main.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
doc/qtcreator/images/qtcreator-options-android-sdk-tools.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 28 KiB

22
doc/qtcreator/src/analyze/creator-analyze.qdoc
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Creator documentation. ** This file is part of the Qt Creator documentation.
@@ -55,40 +55,46 @@
\li \l{Profiling QML Applications}{QML Profiler} \li \l{Profiling QML Applications}{QML Profiler}
You can inspect binding evaluations, signal handling, and Inspect binding evaluations, signal handling, and
painting operations when running QML code. This is useful for painting operations when running QML code. This is useful for
identifying potential bottlenecks, especially in the evaluation identifying potential bottlenecks, especially in the evaluation
of bindings. of bindings.
\li \l{Checking Code Coverage}{Squish Coco}
Analyze the way an application runs as part of a test suite, for
example, and use the results to make the tests more efficient and
complete.
\li \l{Using Valgrind Code Analysis Tools}{Valgrind Code Analysis Tools} \li \l{Using Valgrind Code Analysis Tools}{Valgrind Code Analysis Tools}
You can detect problems in memory management by using the Memcheck Detect problems in memory management by using the Memcheck
tool and find cache misses in the code by using the Callgrind tool. tool and find cache misses in the code by using the Callgrind tool.
\li \l{Using Clang Tools}{Clang Tools} \li \l{Using Clang Tools}{Clang Tools}
You can detect problems in C, C++, and Objective-C programs by Detect problems in C, C++, and Objective-C programs by
using Clang-Tidy and Clazy. using Clang-Tidy and Clazy.
\li \l{Detecting Memory Leaks with Heob}{Heob} \li \l{Detecting Memory Leaks with Heob}{Heob}
You can use the Heob heap observer on Windows to detect buffer Use the Heob heap observer on Windows to detect buffer
overruns and memory leaks. overruns and memory leaks.
\li \l{Analyzing CPU Usage}{Performance Analyzer} \li \l{Analyzing CPU Usage}{Performance Analyzer}
You can analyze the CPU usage of embedded applications and Linux Analyze the CPU usage of embedded applications and Linux
desktop applications with the Performance Analyzer that integrates desktop applications with the Performance Analyzer that integrates
the Linux Perf tool. the Linux Perf tool.
\li \l{Analyzing Code with Cppcheck}{Cppcheck} \li \l{Analyzing Code with Cppcheck}{Cppcheck}
You can use the experimental Cppcheck plugin to detect undefined Use the experimental Cppcheck plugin to detect undefined
behavior and dangerous coding constructs. behavior and dangerous coding constructs.
\li \l{Visualizing Chrome Trace Events}{Chrome Trace Format Visualizer} \li \l{Visualizing Chrome Trace Events}{Chrome Trace Format Visualizer}
You can use the Chrome Trace Format (CTF) Visualizer to view Use the Chrome Trace Format (CTF) Visualizer to view
Chrome trace events. This is especially useful when viewing Chrome trace events. This is especially useful when viewing
large trace files that are difficult to visualize using the large trace files that are difficult to visualize using the
built-in trace-viewer (\c{chrome://tracing}). built-in trace-viewer (\c{chrome://tracing}).

120
doc/qtcreator/src/analyze/creator-coco.qdoc Normal file
View File

@@ -0,0 +1,120 @@
/****************************************************************************
**
** Copyright (C) 2022 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.
**
****************************************************************************/
/*!
\previouspage creator-qml-performance-monitor.html
\page creator-coco.html
\nextpage creator-valgrind-overview.html
\title Checking Code Coverage
\l{https://doc.froglogic.com/squish-coco/latest/}{Squish Coco} is a complete
code coverage tool chain for Tcl, QML, C# and C/C++ programs that runs on
\macOS, Linux, and Windows.
Squish Coco analyzes the way an application runs, as part of a test suite,
for example. The results enable you to make the tests more efficient and
complete.
You can:
\list
\li Find untested code sections.
\li Find redundant tests which can then be eliminated. Squish Coco can
identify portions of the source code that are covered by a test. It
can detect whether a new test covers lines in the source code that
the existing tests do not cover.
\li Find dead code by displaying code that is never executed.
\li Calculate the optimum test execution order so as to maximize
test coverage for each run. This is particularly useful for manual
testing.
\li Analyze two separate versions of an application and compare the
differences. This makes it possible to see which tests are affected
by source code modifications and also to get some measure of the
test coverage of a patch or hot fix.
\li Measure the execution time of applications and tests.
\endlist
The experimental Coco plugin integrates Coco CoverageBrowser into \QC.
It enables you to analyze the test coverage by loading an instrumentation
database (a .csmes file) that was generated by Coco CoverageScanner.
It is currently supported only on Windows, with Squish Coco version 6.0,
or later.
To use the plugin, you must download and install Squish Coco.
\section1 Enabling the Coco Plugin
To enable the Coco plugin:
\list 1
\li Select \uicontrol Help > \uicontrol {About Plugins} >
\uicontrol Utilities > \uicontrol Coco to enable the plugin.
\li Select \uicontrol {Restart Now} to restart \QC and load the plugin.
\endlist
\section1 Configuring Coco
\list 1
\li Select \uicontrol Analyze > \uicontrol {Squish Coco}.
\image qtcreator-coco.png "Coco CoverageBrowser and CSMes file"
\li In \uicontrol {CoverageBrowser}, enter the path to the Coco
coverage browser to use for analyzing a .csmes file.
\li In \uicontrol CSMes, select the instrumentation database to load.
\li Select \uicontrol Open to start CoverageBrowser.
\li In CoverageBrowser, select \uicontrol File >
\uicontrol {Load Execution Report} and select the .csexe for the
coverage scan.
\image coco-coveragebrowser-load-execution-report.png "Load Execution Report dialog"
\li If you want to reuse the execution report, deselect the
\uicontrol {Delete execution report after loading} check box.
\endlist
Open the analyzed files in \QC. The results of the analysis are displayed
after the code in \uicontrol Edit mode. You can change the fonts and colors
used for different types of results.
\section1 Changing Fonts and Colors
To change the default fonts and colors, select \uicontrol Tools >
\uicontrol Options > \uicontrol {Text Editor} > \uicontrol {Font & Colors}.
Create your own color scheme and select new fonts and colors for the
following results:
\list
\li Code Coverage Added Code
\li Partially Covered Code
\li Uncovered Code
\li Fully Covered Code
\li Manually Validated Code
\li Code Coverage Dead Code
\li Code Coverage Execution Count too Low
\li Implicitly Not Covered Code
\li Implicitly Covered Code
\li Implicit Manual Coverage Validation
\endlist
For more information, see \l{Specifying Text Editor Settings}.
*/

2
doc/qtcreator/src/analyze/creator-valgrind-overview.qdoc
View File

@@ -30,7 +30,7 @@
// ********************************************************************** // **********************************************************************
/*! /*!
\previouspage creator-qml-performance-monitor.html \previouspage creator-coco.html
\page creator-valgrind-overview.html \page creator-valgrind-overview.html
\nextpage creator-analyzer.html \nextpage creator-analyzer.html

8
doc/qtcreator/src/android/androiddev.qdoc
View File

@@ -111,8 +111,8 @@
\li The installed NDK versions are listed in \li The installed NDK versions are listed in
\uicontrol {Android NDK list}. \uicontrol {Android NDK list}.
The locked items were installed by the SDK Manager, The locked items were installed by the SDK Manager,
and can only be modified from the \uicontrol {SDK Manager} tab. and can only be modified from the \uicontrol {Android SDK Manager}
For more information, see \l{Managing Android NDK Packages}. dialog. For more information, see \l{Managing Android NDK Packages}.
\li Select the \uicontrol {Automatically create kits for Android tool chains} \li Select the \uicontrol {Automatically create kits for Android tool chains}
check box to allow \QC to create the kits for you. \QC displays a check box to allow \QC to create the kits for you. \QC displays a
warning if it cannot find a suitable Qt version. warning if it cannot find a suitable Qt version.
@@ -179,8 +179,8 @@
\image qtcreator-options-android-sdk-tools.png "Android NDK and SDK checks" \image qtcreator-options-android-sdk-tools.png "Android NDK and SDK checks"
The locked versions were installed by the SDK Manager, and can only The locked versions were installed by the SDK Manager, and can only
be modified from the SDK Manager tab. For more information, see be modified from the \uicontrol {Android SDK Manager} dialog.
\l{Managing Android SDK Packages}. For more information, see \l{Managing Android SDK Packages}.
To manually download NDKs, select \inlineimage icons/online.png To manually download NDKs, select \inlineimage icons/online.png
. .

8
doc/qtcreator/src/editors/creator-clangformat.qdocinc
View File

@@ -52,12 +52,14 @@
\uicontrol Edit > \uicontrol {ClangFormat} > \uicontrol Edit > \uicontrol {ClangFormat} >
\uicontrol {Override Clang Format configuration file}. \uicontrol {Override Clang Format configuration file}.
\image qtcreator-code-style-clang-format.png "C++ Clang Format options" \image qtcreator-code-style-clang-format.png "C++ Clang Format preferences"
In \uicontrol {Formatting mode}, select \uicontrol {Indenting Only} to only In \uicontrol {Formatting mode}, select \uicontrol {Indenting Only} to only
indent code. Select \uicontrol {Full Formatting} to use the \key {Ctrl+I} indent code. Select \uicontrol {Full Formatting} to use the \key {Ctrl+I}
keyboard shortcut to format code instead of indenting it and to apply the keyboard shortcut to format code instead of indenting. To apply the
formatting to the edited code when you save the file. formatting while you type, select \uicontrol {Format while typing}. To apply
the formatting to the edited code when you save the file, select
\uicontrol {Format edited code on file save}.
This creates a local configuration file that overrides the one stored in the This creates a local configuration file that overrides the one stored in the
file system. file system.

22
doc/qtcreator/src/editors/creator-editors-options-text.qdoc
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Creator documentation. ** This file is part of the Qt Creator documentation.
@@ -40,8 +40,9 @@
\title Specifying Text Editor Settings \title Specifying Text Editor Settings
Set the font preferences and apply color schemes for syntax highlighting in Set the font preferences and apply color schemes for syntax highlighting,
\uicontrol Edit > \uicontrol Preferences > \uicontrol {Text Editor} > diff editor, and code analysis results in \uicontrol Edit >
\uicontrol Preferences\uicontrol Tools > \uicontrol {Text Editor} >
\uicontrol {Font & Colors}. \uicontrol {Font & Colors}.
\image qtcreator-font-colors.png "Text editor options" \image qtcreator-font-colors.png "Text editor options"
@@ -62,9 +63,8 @@
\section2 Defining Color Schemes \section2 Defining Color Schemes
You can select one of the predefined color schemes for syntax highlighting You can select one of the predefined color schemes or create customized
or create customized color schemes. The color schemes apply to highlighting color schemes.
both C++ and QML files and generic files.
To create a color scheme: To create a color scheme:
@@ -77,20 +77,20 @@
\li Enter a name for the color scheme and click \uicontrol OK. \li Enter a name for the color scheme and click \uicontrol OK.
\li In the \uicontrol Foreground field, specify the color of the selected \li In the \uicontrol Foreground field, specify the color of the selected
code element. code element or message.
\li In the \uicontrol Background field, select the background \li In the \uicontrol Background field, select the background
color for the code element. color for the code element or message.
The backgound of the \uicontrol Text element determines the background of the The backgound of the \uicontrol Text element determines the background of the
code editor. code editor.
\li In \uicontrol Font, select \uicontrol Bold or \uicontrol Italic to \li In \uicontrol Font, select \uicontrol Bold or \uicontrol Italic to
format the text of the selected code element by making it bold or format the text of the selected code element or message by making it
italic. bold or italic.
\li In \uicontrol Underline, select the color and style to use for \li In \uicontrol Underline, select the color and style to use for
underlining code elements. underlining code elements or messages.
\endlist \endlist

10
doc/qtcreator/src/mcu/creator-mcu-dev.qdoc
View File

@@ -197,16 +197,18 @@
\section1 Supported Qt for MCUs SDKs \section1 Supported Qt for MCUs SDKs
Since version 4.12.4, \QC supports versions 1.3 through 1.9 of the Qt for MCUs SDK. Since version 7.0.0, \QC supports version 2.0 and later of the Qt for MCUs SDK.
Since version 6.0.0, \QC adds support for versions 2.0 and later of the Qt for MCUs SDK. For older versions, refer to the following table.
For older versions refer to the following table.
\table \table
\header \header
\li \QC version \li \QC version
\li Qt for MCUs SDK version \li Qt for MCUs SDK version
\row \row
\li 6.0.0 or later \li 7.0.0 or later
\li 2.0 or later
\row
\li 6.0.x
\li 1.3 or later, including 2.0 or later \li 1.3 or later, including 2.0 or later
\row \row
\li 4.12.4 up to 5.0.3 \li 4.12.4 up to 5.0.3

179
doc/qtcreator/src/projects/creator-only/creator-projects-targets.qdoc
View File

@@ -84,21 +84,42 @@
\li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits > \li Select \uicontrol Edit > \uicontrol Preferences > \uicontrol Kits >
\uicontrol Add. \uicontrol Add.
\image qtcreator-kits-add.png
To clone the selected kit, select \uicontrol Clone. To clone the selected kit, select \uicontrol Clone.
\li In the \uicontrol Name column, enter a name for the kit. \li Specify kit settings. The settings to specify depend on the build
system and device type.
\li Select the \inlineimage icons/qtcreator-desktopdevice-button.png \li Select \uicontrol OK to create the kit.
button to select an image to use as an icon for the kit.
\li In the \uicontrol {File system name} field, enter a name for the kit \endlist
to use as a part of directory names. This value is used for the
\e CurrentKit:FileSystemName variable, which determines the name of
the shadow build directory, for example.
\li In the \uicontrol{Device type} field, select the type of the device. \QC uses the \e {default kit} if it does not have enough information to
choose the kit to use. To set the selected kit as the default kit,
select \uicontrol {Make Default}.
\section2 Kit Settings
The following table summarizes the available kit settings.
\table
\header
\li Setting
\li Value
\row
\li \uicontrol Name
\li Name of the kit. You can use variables to generate the kit name
based on the values you set in the other fields.
\row
\li \inlineimage icons/qtcreator-desktopdevice-button.png
\li Image to use as an icon for the kit.
\row
\li \uicontrol {File system name}
\li Name for the kit to use as a part of directory names. This value is
used for the \c CurrentKit:FileSystemName variable, which determines
the name of the shadow build directory, for example.
\row
\li \uicontrol{Device type}
\li Type of the device.
Double-click the icon next to the field to select the image that is Double-click the icon next to the field to select the image that is
displayed in the kit selector for this kit. You can use any displayed in the kit selector for this kit. You can use any
@@ -106,92 +127,96 @@
scaled to the size 64x64 pixels. For example, using the compiler scaled to the size 64x64 pixels. For example, using the compiler
logo as an icon allows you to easily see, which compiler is used to logo as an icon allows you to easily see, which compiler is used to
build the project for the selected kit. build the project for the selected kit.
\row
\li \uicontrol Device
\li The device to run applications on.
\row
\li \uicontrol {Build device}
\li The device to build applications on.
\li In the \uicontrol Device field, select a device. \row
\li \uicontrol Sysroot
\li Directory where the device image is located. If you are not
cross-compiling, leave this field empty.
\row
\li \uicontrol {Emulator skin}
\li Skin to use for the \l {Emulator}{Boot2Qt Emulator Device}.
\row
\li \uicontrol {Compiler}
\li C or C++ compiler that you use to build the project. You can add
compilers to the list if they are installed on the development PC,
but were not detected automatically. For more information, see
\l{Adding Compilers}.
\li In the \uicontrol Sysroot field, specify the directory where the device
image is located. If you are not cross-compiling, leave this field
empty.
\li In the \uicontrol {Emulator skin} field, select the skin to use for
the \l {Emulator}{Boot2Qt Emulator Device}.
\li In the \uicontrol {Compiler} field, select the C or C++ compiler
that you use to build the project. You can add compilers to the list
if they are installed on the development PC, but were not detected
automatically. For more information, see \l{Adding Compilers}.
This setting is used to tell the code model which compiler is used. This setting is used to tell the code model which compiler is used.
If your project type and build tool support it, \QC also tells the If your project type and build tool support it, \QC also tells the
build tool to use this compiler for building the project. build tool to use this compiler for building the project.
\row
\li In the \uicontrol Environment field, select \uicontrol Change to modify \li \uicontrol Environment
environment variable values for build environments in \li Select \uicontrol Change to modify environment variable values for
the \uicontrol {Edit Environment Changes} dialog. For more information build environments in the \uicontrol {Edit Environment Changes}
about how to add and remove variable values, see \l{Batch Editing}. dialog. For more information about how to add and remove variable
values, see \l{Batch Editing}.
\li Select the \uicontrol {Force UTF-8 MSVC compiler output} check box \row
to either switch the language of MSVC to English or to keep the \li \uicontrol {Force UTF-8 MSVC compiler output}
language setting and just force UTF-8 output, depending on the \li Either switches the language of MSVC to English or keeps the
language setting and just forces UTF-8 output, depending on the
MSVC compiler used. MSVC compiler used.
\row
\li In the \uicontrol Debugger field, select the debugger to debug the project \li \uicontrol Debugger
on the target platform. \QC automatically detects available \li Debugger to debug the project on the target platform. \QC
debuggers and displays a suitable debugger in the field. You can automatically detects available debuggers and displays a
add debuggers to the list. For more information, see suitable debugger in the field. You can add debuggers to the list.
\l{Adding Debuggers}. For more information, see \l{Adding Debuggers}.
For Android kits, the \uicontrol {Android GDB server} field will For Android kits, the \uicontrol {Android GDB server} field will
display the path to GDB server executable. display the path to GDB server executable.
\row
\li In the \uicontrol {Qt version} field, select the Qt version to use for \li \uicontrol {Qt version}
building the project. You can add Qt versions to the list if they \li Qt version to use for building the project. You can add Qt versions
are installed on the development PC, but were not detected to the list if they are installed on the development PC, but were not
automatically. For more information, see \l{Adding Qt Versions}. detected automatically. For more information, see \l{Adding Qt Versions}.
\QC checks the directories listed in the \c{PATH} environment \QC checks the directories listed in the \c{PATH} environment
variable for the qmake executable. If a qmake executable is found, variable for the qmake executable. If a qmake executable is found,
it is referred to as \b{Qt in PATH} and selected as the Qt it is referred to as \b{Qt in PATH} and selected as the Qt
version to use for the \uicontrol Desktop kit that is created by default. version to use for the \uicontrol Desktop kit that is created by default.
\row
\li In the \uicontrol {Qt mkspec} field, specify the name of the mkspec \li \uicontrol {Qt mkspec}
configuration that should be used by qmake. If you leave this field \li Name of the mkspec configuration that should be used by qmake. If
empty, the default mkspec of the selected Qt version is used. you leave this field empty, the default mkspec of the selected Qt
version is used.
\li In the \uicontrol {Additional Qbs profile settings} field, select \row
\uicontrol Change to add settings to Qbs build profiles. For more \li \uicontrol {Additional Qbs profile settings}
information, see \l {Editing Qbs Profiles}. \li Select \uicontrol Change to add settings to Qbs build profiles.
For more information, see \l {Editing Qbs Profiles}.
\li In the \uicontrol {CMake Tool} field, select the CMake executable \row
to use for building the project. Select \uicontrol Manage to add \li \uicontrol {CMake Tool}
installed CMake executables to the list. For more information, see \li CMake executable to use for building the project. Select
\l{Adding CMake Tools}. \uicontrol Manage to add installed CMake executables to
the list. For more information, see \l{Adding CMake Tools}.
\li In the \uicontrol {CMake generator} field, select \uicontrol Change \row
to edit the CMake \li \uicontrol {CMake generator}
Generator to use for producing project files. Only the generators \li Select \uicontrol Change to edit the CMake Generator to use for
producing project files. Only the generators
with names beginning with the string \uicontrol CodeBlocks produce with names beginning with the string \uicontrol CodeBlocks produce
all the necessary data for the \QC code model. \QC displays a all the necessary data for the \QC code model. \QC displays a
warning if you select a generator that is not supported. warning if you select a generator that is not supported.
For more information, see \l{Using Ninja as a CMake Generator}. For more information, see \l{Using Ninja as a CMake Generator}.
\row
\li In the \uicontrol {CMake configuration} field, select \li \uicontrol {CMake configuration}
\uicontrol Change to edit the parameters of the CMake configuration \li Select \uicontrol Change to edit the parameters of the CMake
for the kit. configuration for the kit.
\row
\li In the \uicontrol {Meson tool} field, select the Meson tool to use \li \uicontrol {Meson tool}
for building the project. Select \uicontrol Manage to add installed \li Meson tool to use for building the project. Select \uicontrol Manage
Meson tools to the list. For more information, see to add installed Meson tools to the list. For more information, see
\l{Adding Meson Tools}. \l{Adding Meson Tools}.
\row
\li In the \uicontrol {Ninja tool} field, select the Ninja tool to use \li \uicontrol {Ninja tool}
for building the project with Meson. Select \uicontrol Manage to add installed \li Ninja tool to use for building the project with Meson. Select
Ninja tools to the list. \uicontrol Manage to add installed Ninja tools to the list.
\endtable
\endlist
\QC uses the \e {default kit} if it does not have enough information to
choose the kit to use. To set the selected kit as the default kit,
select \uicontrol {Make Default}.
\section1 Editing Qbs Profiles \section1 Editing Qbs Profiles

1
doc/qtcreator/src/qtcreator-toc.qdoc
View File

@@ -193,6 +193,7 @@
\li \l{Analyzing Code} \li \l{Analyzing Code}
\list \list
\li \l{Profiling QML Applications} \li \l{Profiling QML Applications}
\li \l{Checking Code Coverage}
\li \l{Using Valgrind Code Analysis Tools} \li \l{Using Valgrind Code Analysis Tools}
\list \list
\li \l{Detecting Memory Leaks with Memcheck} \li \l{Detecting Memory Leaks with Memcheck}

2
doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
View File

@@ -36,7 +36,7 @@
\nextpage studio-advanced.html \nextpage studio-advanced.html
\else \else
\previouspage creator-analyze-mode.html \previouspage creator-analyze-mode.html
\nextpage creator-valgrind-overview.html \nextpage creator-coco.html
\endif \endif
\title Profiling QML Applications \title Profiling QML Applications

2
share/qtcreator/android/sdk_definitions.json
View File

@@ -22,7 +22,7 @@
"ndk_path": "ndk/23.1.7779620" "ndk_path": "ndk/23.1.7779620"
}, },
{ {
"versions": ["6.3", "6.2", "5.15"], "versions": ["6.3", "6.2", "5.15.[9-20]"],
"sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670"], "sdk_essential_packages": ["build-tools;31.0.0", "ndk;22.1.7171670"],
"ndk_path": "ndk/22.1.7171670" "ndk_path": "ndk/22.1.7171670"
}, },

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/AbstractButtonSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/BusyIndicatorSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ButtonSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/CheckBoxSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/CheckDelegateSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/CheckSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ComboBoxSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ContainerSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ControlSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

29
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ControlSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2022 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/DelayButtonSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/DialSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/DialogSpecifics.qml
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/DrawerSpecifics.qml
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/FrameSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/GroupBoxSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

29
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/IconSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2022 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

29
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/InsetSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2022 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ItemDelegateSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ItemDelegateSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/LabelSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PageIndicatorSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PageSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PaneSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PaneSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PopupSection.qml
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/PopupSpecifics.qml
View File

@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of Qt Creator. ** This file is part of Qt Creator.

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ProgressBarSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/RadioButtonSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/RadioDelegateSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/RangeSliderSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/RoundButtonSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ScrollViewSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/SliderSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/SpinBoxSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/StackViewSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/SwipeDelegateSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/SwipeViewSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/SwitchDelegateSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/SwitchSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/TabBarSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/TabButtonSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/TextAreaSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/TextFieldSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/TextSection.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ToolBarSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ToolButtonSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/ToolSeparatorSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

31
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Controls/TumblerSpecifics.qml
View File

@@ -1,36 +1,25 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2022 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** This file is part of Qt Creator.
** **
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in ** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms ** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us. ** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
** **
** GNU General Public License Usage ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free ** General Public License version 3 as published by the Free Software
** Software Foundation and appearing in the file LICENSE.GPL included in ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** the packaging of this file. Please review the following information to ** included in the packaging of this file. Please review the following
** ensure the GNU General Public License version 2.0 requirements will be ** information to ensure the GNU General Public License requirements will
** met: http://www.gnu.org/licenses/gpl-2.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/FilterComboBox.qml
View File

@@ -744,7 +744,7 @@ Item {
anchors.fill: parent anchors.fill: parent
enabled: popup.visible && popupMouseArea.active enabled: popup.visible && popupMouseArea.active
hoverEnabled: true hoverEnabled: popupMouseArea.enabled
onPositionChanged: { popupMouseArea.active = false } onPositionChanged: { popupMouseArea.active = false }
} }
} }

16
src/libs/utils/terminalprocess.cpp
View File

@@ -483,24 +483,26 @@ void TerminalImpl::killProcess()
void TerminalImpl::killStub() void TerminalImpl::killStub()
{ {
if (!isRunning())
return;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if (d->m_pid) { TerminateProcess(d->m_pid->hProcess, (unsigned)-1);
TerminateProcess(d->m_pid->hProcess, (unsigned)-1); WaitForSingleObject(d->m_pid->hProcess, INFINITE);
WaitForSingleObject(d->m_pid->hProcess, INFINITE); cleanupStub();
cleanupStub();
}
#else #else
sendCommand('s'); sendCommand('s');
stubServerShutdown(); stubServerShutdown();
d->m_process.waitForFinished();
#endif #endif
emitFinished(-1, QProcess::CrashExit);
} }
void TerminalImpl::stopProcess() void TerminalImpl::stopProcess()
{ {
killProcess(); killProcess();
killStub(); killStub();
if (isRunning() && HostOsInfo::isAnyUnixHost())
d->m_process.close();
} }
bool TerminalImpl::isRunning() const bool TerminalImpl::isRunning() const

4
src/plugins/android/androidconfigurations.cpp
View File

@@ -344,13 +344,13 @@ void AndroidConfig::parseDependenciesJson()
auto fillQtVersionsRange = [](const QString &shortVersion) { auto fillQtVersionsRange = [](const QString &shortVersion) {
QList<QtVersionNumber> versions; QList<QtVersionNumber> versions;
QRegularExpression re("([0-9]\\.[0-9]*\\.)\\[([0-9])\\-([0-9])\\]"); const QRegularExpression re(R"(([0-9]\.[0-9]+\.)\[([0-9]+)\-([0-9]+)\])");
QRegularExpressionMatch match = re.match(shortVersion); QRegularExpressionMatch match = re.match(shortVersion);
if (match.hasMatch() && match.lastCapturedIndex() == 3) if (match.hasMatch() && match.lastCapturedIndex() == 3)
for (int i = match.captured(2).toInt(); i <= match.captured(3).toInt(); ++i) for (int i = match.captured(2).toInt(); i <= match.captured(3).toInt(); ++i)
versions.append(QtVersionNumber(match.captured(1) + QString::number(i))); versions.append(QtVersionNumber(match.captured(1) + QString::number(i)));
else else
versions.append(QtVersionNumber(shortVersion)); versions.append(QtVersionNumber(shortVersion + ".-1"));
return versions; return versions;
}; };

2
src/plugins/android/androidqtversion.cpp
View File

@@ -28,7 +28,7 @@
#include "androidconfigurations.h" #include "androidconfigurations.h"
#include "androidmanager.h" #include "androidmanager.h"
#include <utils/algorithm.h>> #include <utils/algorithm.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>

9
src/plugins/android/androidsettingswidget.cpp
View File

@@ -32,14 +32,11 @@
#include "androidsdkdownloader.h" #include "androidsdkdownloader.h"
#include "androidsdkmanager.h" #include "androidsdkmanager.h"
#include "androidsdkmanagerwidget.h" #include "androidsdkmanagerwidget.h"
#include "androidtoolchain.h"
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/infolabel.h> #include <utils/infolabel.h>
#include <utils/listmodel.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/progressindicator.h> #include <utils/progressindicator.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -49,16 +46,10 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QDir> #include <QDir>
#include <QFileDialog> #include <QFileDialog>
#include <QFutureWatcher>
#include <QInputDialog>
#include <QList> #include <QList>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMessageBox> #include <QMessageBox>
#include <QModelIndex>
#include <QScrollArea>
#include <QSettings>
#include <QStandardPaths> #include <QStandardPaths>
#include <QString>
#include <QTimer> #include <QTimer>
#include <QUrl> #include <QUrl>
#include <QWidget> #include <QWidget>

6
src/plugins/android/avddialog.cpp
View File

@@ -107,18 +107,20 @@ int AvdDialog::exec()
const AndroidAvdManager avdManager = AndroidAvdManager(m_androidConfig); const AndroidAvdManager avdManager = AndroidAvdManager(m_androidConfig);
QFutureWatcher<CreateAvdInfo> createAvdFutureWatcher; QFutureWatcher<CreateAvdInfo> createAvdFutureWatcher;
createAvdFutureWatcher.setFuture(avdManager.createAvd(result));
QEventLoop loop; QEventLoop loop;
QObject::connect(&createAvdFutureWatcher, &QFutureWatcher<CreateAvdInfo>::finished, QObject::connect(&createAvdFutureWatcher, &QFutureWatcher<CreateAvdInfo>::finished,
&loop, &QEventLoop::quit); &loop, &QEventLoop::quit);
QObject::connect(&createAvdFutureWatcher, &QFutureWatcher<CreateAvdInfo>::canceled, QObject::connect(&createAvdFutureWatcher, &QFutureWatcher<CreateAvdInfo>::canceled,
&loop, &QEventLoop::quit); &loop, &QEventLoop::quit);
createAvdFutureWatcher.setFuture(avdManager.createAvd(result));
loop.exec(QEventLoop::ExcludeUserInputEvents); loop.exec(QEventLoop::ExcludeUserInputEvents);
const QFuture<CreateAvdInfo> future = createAvdFutureWatcher.future(); const QFuture<CreateAvdInfo> future = createAvdFutureWatcher.future();
if (future.isResultReadyAt(0)) if (future.isResultReadyAt(0)) {
m_createdAvdInfo = future.result(); m_createdAvdInfo = future.result();
AndroidDeviceManager::instance()->updateAvdsList();
}
} }
return execResult; return execResult;

26
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -751,9 +751,8 @@ ClangdClient::ClangdCompletionAssistProcessor::generateCompletionItems(
return itemGenerator(items); return itemGenerator(items);
const QString content = doc->toPlainText(); const QString content = doc->toPlainText();
const bool requiresSignal = CppEditor::CppModelManager::instance() const bool requiresSignal = CppEditor::CppModelManager::instance()
->positionRequiresSignal(filePath().toString(), ->getSignalSlotType(filePath().toString(), content.toUtf8(), pos)
content.toUtf8(), == CppEditor::SignalSlotType::NewStyleSignal;
pos);
if (requiresSignal) if (requiresSignal)
return itemGenerator(Utils::filtered(items, criterion)); return itemGenerator(Utils::filtered(items, criterion));
return itemGenerator(items); return itemGenerator(items);
@@ -846,9 +845,11 @@ static void addToCompilationDb(QJsonObject &cdb,
CppEditor::UsePrecompiledHeaders usePch, CppEditor::UsePrecompiledHeaders usePch,
const QJsonArray &projectPartOptions, const QJsonArray &projectPartOptions,
const Utils::FilePath &workingDir, const Utils::FilePath &workingDir,
const CppEditor::ProjectFile &sourceFile) const CppEditor::ProjectFile &sourceFile,
bool clStyle)
{ {
QJsonArray args = clangOptionsForFile(sourceFile, projectPart, projectPartOptions, usePch); QJsonArray args = clangOptionsForFile(sourceFile, projectPart, projectPartOptions, usePch,
clStyle);
// TODO: clangd seems to apply some heuristics depending on what we put here. // TODO: clangd seems to apply some heuristics depending on what we put here.
// Should we make use of them or keep using our own? // Should we make use of them or keep using our own?
@@ -890,7 +891,8 @@ ClangdClient::ClangdClient(Project *project, const Utils::FilePath &jsonDbDir)
const QJsonArray projectPartOptions = fullProjectPartOptions( const QJsonArray projectPartOptions = fullProjectPartOptions(
optionsBuilder, globalClangOptions()); optionsBuilder, globalClangOptions());
const QJsonArray clangOptions = clangOptionsForFile({}, optionsBuilder.projectPart(), const QJsonArray clangOptions = clangOptionsForFile({}, optionsBuilder.projectPart(),
projectPartOptions, usePch); projectPartOptions, usePch,
optionsBuilder.isClStyle());
initOptions.insert("fallbackFlags", clangOptions); initOptions.insert("fallbackFlags", clangOptions);
setInitializationOptions(initOptions); setInitializationOptions(initOptions);
} }
@@ -1019,7 +1021,7 @@ void ClangdClient::findUsages(TextDocument *document, const QTextCursor &cursor,
// Otherwise get the proper spelling of the search term from clang, so we can put it into the // Otherwise get the proper spelling of the search term from clang, so we can put it into the
// search widget. // search widget.
const auto symbolInfoHandler = [this, doc = QPointer(document), adjustedCursor, replacement, categorize] const auto symbolInfoHandler = [this, doc = QPointer(document), adjustedCursor, replacement, categorize]
(const QString &, const QString &name, const MessageId &) { (const QString &name, const QString &, const MessageId &) {
if (!doc) if (!doc)
return; return;
if (name.isEmpty()) if (name.isEmpty())
@@ -1329,7 +1331,7 @@ void ClangdClient::updateParserConfig(const Utils::FilePath &filePath,
const QJsonArray projectPartOptions = fullProjectPartOptions( const QJsonArray projectPartOptions = fullProjectPartOptions(
optionsBuilder, globalClangOptions()); optionsBuilder, globalClangOptions());
addToCompilationDb(cdbChanges, *projectPart, CppEditor::getPchUsage(), projectPartOptions, addToCompilationDb(cdbChanges, *projectPart, CppEditor::getPchUsage(), projectPartOptions,
filePath.parentDir(), file); filePath.parentDir(), file, optionsBuilder.isClStyle());
QJsonObject settings; QJsonObject settings;
addCompilationDb(settings, cdbChanges); addCompilationDb(settings, cdbChanges);
DidChangeConfigurationParams configChangeParams; DidChangeConfigurationParams configChangeParams;
@@ -1609,7 +1611,7 @@ void ClangdClient::followSymbol(TextDocument *document,
d->followSymbol = new ClangdFollowSymbol(this, adjustedCursor, editorWidget, document, callback, d->followSymbol = new ClangdFollowSymbol(this, adjustedCursor, editorWidget, document, callback,
openInSplit); openInSplit);
connect(d->followSymbol, &ClangdFollowSymbol::done, this, [this] { connect(d->followSymbol, &ClangdFollowSymbol::done, this, [this] {
delete d->followSymbol; d->followSymbol->deleteLater();
d->followSymbol = nullptr; d->followSymbol = nullptr;
}); });
} }
@@ -1626,7 +1628,7 @@ void ClangdClient::switchDeclDef(TextDocument *document, const QTextCursor &curs
delete d->switchDeclDef; delete d->switchDeclDef;
d->switchDeclDef = new ClangdSwitchDeclDef(this, document, cursor, editorWidget, callback); d->switchDeclDef = new ClangdSwitchDeclDef(this, document, cursor, editorWidget, callback);
connect(d->switchDeclDef, &ClangdSwitchDeclDef::done, this, [this] { connect(d->switchDeclDef, &ClangdSwitchDeclDef::done, this, [this] {
delete d->switchDeclDef; d->switchDeclDef->deleteLater();
d->switchDeclDef = nullptr; d->switchDeclDef = nullptr;
}); });
} }
@@ -2237,6 +2239,10 @@ IAssistProcessor *ClangdClient::ClangdCompletionAssistProvider::createProcessor(
contextAnalyzer.positionEndOfExpression(), contextAnalyzer.positionEndOfExpression(),
contextAnalyzer.completionOperator(), contextAnalyzer.completionOperator(),
CustomAssistMode::Preprocessor); CustomAssistMode::Preprocessor);
case ClangCompletionContextAnalyzer::CompleteSignal:
case ClangCompletionContextAnalyzer::CompleteSlot:
if (!interface->isBaseObject())
return CppEditor::getCppCompletionAssistProcessor();
default: default:
break; break;
} }

13
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -431,9 +431,13 @@ void ClangModelManagerSupport::updateLanguageClient(
const Client * const currentClient = LanguageClientManager::clientForDocument(doc); const Client * const currentClient = LanguageClientManager::clientForDocument(doc);
if (!settings.sizeIsOkay(doc->filePath())) if (!settings.sizeIsOkay(doc->filePath()))
continue; continue;
if (!currentClient || !currentClient->project() if (currentClient && currentClient->project()
|| currentClient->state() != Client::Initialized && currentClient->project() != project) {
|| project->isKnownFile(doc->filePath())) { continue;
}
if (const Project * const docProject
= SessionManager::projectForFile(doc->filePath());
!docProject || docProject == project) {
LanguageClientManager::openDocumentWithClient(doc, client); LanguageClientManager::openDocumentWithClient(doc, client);
hasDocuments = true; hasDocuments = true;
} }
@@ -546,7 +550,8 @@ void ClangModelManagerSupport::claimNonProjectSources(ClangdClient *client)
} }
if (!ClangdSettings::instance().sizeIsOkay(doc->filePath())) if (!ClangdSettings::instance().sizeIsOkay(doc->filePath()))
continue; continue;
client->openDocument(doc); if (!ProjectExplorer::SessionManager::projectForFile(doc->filePath()))
LanguageClientManager::openDocumentWithClient(doc, client);
} }
} }

12
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -130,7 +130,8 @@ static QJsonObject createFileObject(const FilePath &buildDir,
const ProjectFile &projFile, const ProjectFile &projFile,
CompilationDbPurpose purpose, CompilationDbPurpose purpose,
const QJsonArray &projectPartOptions, const QJsonArray &projectPartOptions,
UsePrecompiledHeaders usePch) UsePrecompiledHeaders usePch,
bool clStyle)
{ {
QJsonObject fileObject; QJsonObject fileObject;
fileObject["file"] = projFile.path; fileObject["file"] = projFile.path;
@@ -155,7 +156,7 @@ static QJsonObject createFileObject(const FilePath &buildDir,
args.append(langOptionPart); args.append(langOptionPart);
} }
} else { } else {
args = clangOptionsForFile(projFile, projectPart, projectPartOptions, usePch); args = clangOptionsForFile(projFile, projectPart, projectPartOptions, usePch, clStyle);
args.prepend("clang"); // TODO: clang-cl for MSVC targets? Does it matter at all what we put here? args.prepend("clang"); // TODO: clang-cl for MSVC targets? Does it matter at all what we put here?
} }
@@ -200,7 +201,8 @@ GenerateCompilationDbResult generateCompilationDB(const CppEditor::ProjectInfo::
} }
for (const ProjectFile &projFile : projectPart->files) { for (const ProjectFile &projFile : projectPart->files) {
const QJsonObject json = createFileObject(baseDir, args, *projectPart, projFile, const QJsonObject json = createFileObject(baseDir, args, *projectPart, projFile,
purpose, ppOptions, usePch); purpose, ppOptions, usePch,
optionsBuilder.isClStyle());
if (compileCommandsFile.size() > 1) if (compileCommandsFile.size() > 1)
compileCommandsFile.write(","); compileCommandsFile.write(",");
compileCommandsFile.write('\n' + QJsonDocument(json).toJson().trimmed()); compileCommandsFile.write('\n' + QJsonDocument(json).toJson().trimmed());
@@ -274,9 +276,11 @@ QString DiagnosticTextInfo::clazyCheckName(const QString &option)
QJsonArray clangOptionsForFile(const ProjectFile &file, const ProjectPart &projectPart, QJsonArray clangOptionsForFile(const ProjectFile &file, const ProjectPart &projectPart,
const QJsonArray &generalOptions, UsePrecompiledHeaders usePch) const QJsonArray &generalOptions, UsePrecompiledHeaders usePch,
bool clStyle)
{ {
CompilerOptionsBuilder optionsBuilder(projectPart); CompilerOptionsBuilder optionsBuilder(projectPart);
optionsBuilder.setClStyle(clStyle);
ProjectFile::Kind fileKind = file.kind; ProjectFile::Kind fileKind = file.kind;
if (fileKind == ProjectFile::AmbiguousHeader) { if (fileKind == ProjectFile::AmbiguousHeader) {
fileKind = projectPart.languageVersion <= LanguageVersion::LatestC fileKind = projectPart.languageVersion <= LanguageVersion::LatestC

2
src/plugins/clangcodemodel/clangutils.h
View File

@@ -66,7 +66,7 @@ QJsonArray fullProjectPartOptions(const QJsonArray &projectPartOptions,
QJsonArray clangOptionsForFile(const CppEditor::ProjectFile &file, QJsonArray clangOptionsForFile(const CppEditor::ProjectFile &file,
const CppEditor::ProjectPart &projectPart, const CppEditor::ProjectPart &projectPart,
const QJsonArray &generalOptions, const QJsonArray &generalOptions,
CppEditor::UsePrecompiledHeaders usePch); CppEditor::UsePrecompiledHeaders usePch, bool clStyle);
CppEditor::ProjectPart::ConstPtr projectPartForFile(const QString &filePath); CppEditor::ProjectPart::ConstPtr projectPartForFile(const QString &filePath);

1
src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp
View File

@@ -64,6 +64,7 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti
auto edit = new QComboBox(parent); auto edit = new QComboBox(parent);
edit->setAttribute(Qt::WA_MacSmallSize); edit->setAttribute(Qt::WA_MacSmallSize);
edit->setFocusPolicy(Qt::StrongFocus); edit->setFocusPolicy(Qt::StrongFocus);
edit->setAutoFillBackground(true);
for (const QString &s : qAsConst(data.values)) for (const QString &s : qAsConst(data.values))
edit->addItem(s); edit->addItem(s);
return edit; return edit;

40
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -226,6 +226,27 @@ using namespace Utils;
static ProgressManagerPrivate *m_instance = nullptr; static ProgressManagerPrivate *m_instance = nullptr;
const int RASTER = 20;
class StatusDetailsWidgetContainer : public QWidget
{
public:
StatusDetailsWidgetContainer(QWidget *parent)
: QWidget(parent)
{}
QSize sizeHint() const override
{
// make size fit on raster, to avoid flickering in status bar
// because the output pane buttons resize, if the widget changes a lot (like it is the case for
// the language server indexing)
const QSize preferredSize = layout()->sizeHint();
const int preferredWidth = preferredSize.width();
const int width = preferredWidth + (RASTER - preferredWidth % RASTER);
return {width, preferredSize.height()};
}
};
ProgressManagerPrivate::ProgressManagerPrivate() ProgressManagerPrivate::ProgressManagerPrivate()
: m_opacityEffect(new QGraphicsOpacityEffect(this)) : m_opacityEffect(new QGraphicsOpacityEffect(this))
{ {
@@ -273,13 +294,13 @@ void ProgressManagerPrivate::init()
summaryProgressLayout->setContentsMargins(0, 0, 0, 2); summaryProgressLayout->setContentsMargins(0, 0, 0, 2);
summaryProgressLayout->setSpacing(0); summaryProgressLayout->setSpacing(0);
m_summaryProgressWidget->setLayout(summaryProgressLayout); m_summaryProgressWidget->setLayout(summaryProgressLayout);
m_statusDetailsWidgetContainer = new QWidget(m_summaryProgressWidget); auto statusDetailsWidgetContainer = new StatusDetailsWidgetContainer(m_summaryProgressWidget);
m_statusDetailsWidgetLayout = new QHBoxLayout(m_statusDetailsWidgetContainer); m_statusDetailsWidgetLayout = new QHBoxLayout(statusDetailsWidgetContainer);
m_statusDetailsWidgetLayout->setContentsMargins(0, 0, 0, 0); m_statusDetailsWidgetLayout->setContentsMargins(0, 0, 0, 0);
m_statusDetailsWidgetLayout->setSpacing(0); m_statusDetailsWidgetLayout->setSpacing(0);
m_statusDetailsWidgetLayout->addStretch(1); m_statusDetailsWidgetLayout->addStretch(1);
m_statusDetailsWidgetContainer->setLayout(m_statusDetailsWidgetLayout); statusDetailsWidgetContainer->setLayout(m_statusDetailsWidgetLayout);
summaryProgressLayout->addWidget(m_statusDetailsWidgetContainer); summaryProgressLayout->addWidget(statusDetailsWidgetContainer);
m_summaryProgressBar = new ProgressBar(m_summaryProgressWidget); m_summaryProgressBar = new ProgressBar(m_summaryProgressWidget);
m_summaryProgressBar->setMinimumWidth(70); m_summaryProgressBar->setMinimumWidth(70);
m_summaryProgressBar->setTitleVisible(false); m_summaryProgressBar->setTitleVisible(false);
@@ -616,8 +637,6 @@ void ProgressManagerPrivate::updateVisibilityWithDelay()
QTimer::singleShot(150, this, &ProgressManagerPrivate::updateVisibility); QTimer::singleShot(150, this, &ProgressManagerPrivate::updateVisibility);
} }
const int RASTER = 20;
void ProgressManagerPrivate::updateStatusDetailsWidget() void ProgressManagerPrivate::updateStatusDetailsWidget()
{ {
QWidget *candidateWidget = nullptr; QWidget *candidateWidget = nullptr;
@@ -645,15 +664,6 @@ void ProgressManagerPrivate::updateStatusDetailsWidget()
} }
} }
// make size fit on raster, to avoid flickering in status bar
// because the output pane buttons resize, if the widget changes a lot (like it is the case for
// the language server indexing)
if (candidateWidget) {
const int preferredWidth = candidateWidget->sizeHint().width();
const int width = preferredWidth + (RASTER - preferredWidth % RASTER);
m_statusDetailsWidgetContainer->setFixedWidth(width);
}
if (candidateWidget == m_currentStatusDetailsWidget) if (candidateWidget == m_currentStatusDetailsWidget)
return; return;

1
src/plugins/coreplugin/progressmanager/progressmanager_p.h
View File

@@ -101,7 +101,6 @@ private:
StatusBarWidget *m_statusBarWidgetContainer; StatusBarWidget *m_statusBarWidgetContainer;
QWidget *m_statusBarWidget; QWidget *m_statusBarWidget;
QWidget *m_summaryProgressWidget; QWidget *m_summaryProgressWidget;
QWidget *m_statusDetailsWidgetContainer = nullptr;
QHBoxLayout *m_statusDetailsWidgetLayout = nullptr; QHBoxLayout *m_statusDetailsWidgetLayout = nullptr;
QWidget *m_currentStatusDetailsWidget = nullptr; QWidget *m_currentStatusDetailsWidget = nullptr;
QPointer<FutureProgress> m_currentStatusDetailsProgress; QPointer<FutureProgress> m_currentStatusDetailsProgress;

14
src/plugins/cppeditor/compileroptionsbuilder.cpp
View File

@@ -473,16 +473,16 @@ void CompilerOptionsBuilder::addLanguageVersionAndExtensions()
default: default:
break; break;
case LanguageVersion::CXX14: case LanguageVersion::CXX14:
option = "/std:c++14"; option = "-clang:std=c++14";
break; break;
case LanguageVersion::CXX17: case LanguageVersion::CXX17:
option = "/std:c++17"; option = "-clang:std=c++17";
break; break;
case LanguageVersion::CXX20: case LanguageVersion::CXX20:
option = "/std:c++20"; option = "-clang:std=c++20";
break; break;
case LanguageVersion::CXX2b: case LanguageVersion::CXX2b:
option = "/std:c++latest"; option = "-clang:std=c++2b";
break; break;
} }
@@ -910,12 +910,10 @@ void CompilerOptionsBuilder::evaluateCompilerFlags()
theOption[0] = '-'; theOption[0] = '-';
} }
// Clang-cl (as of Clang 12) frontend doesn't know about -std:c++20
// but the clang front end knows about -std=c++20
// https://github.com/llvm/llvm-project/blob/release/12.x/clang/lib/Driver/ToolChains/Clang.cpp#L5855
if (toolChain == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID || if (toolChain == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID ||
toolChain == ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) { toolChain == ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) {
theOption.replace("-std:c++20", "-clang:-std=c++20"); theOption.replace("-std:c++latest", "-clang:-std=c++2b");
theOption.replace("-std:c++", "-clang:-std=c++");
} }
m_compilerFlags.flags.append(theOption); m_compilerFlags.flags.append(theOption);

1
src/plugins/cppeditor/compileroptionsbuilder.h
View File

@@ -95,6 +95,7 @@ public:
void evaluateCompilerFlags(); void evaluateCompilerFlags();
bool isClStyle() const; bool isClStyle() const;
void setClStyle(bool clStyle) { m_clStyle = clStyle; }
const ProjectPart &projectPart() const { return m_projectPart; } const ProjectPart &projectPart() const { return m_projectPart; }

6
src/plugins/cppeditor/compileroptionsbuilder_test.cpp
View File

@@ -192,7 +192,7 @@ void CompilerOptionsBuilderTest::testLanguageVersionIsExplicitlySetIfNotProvided
UseTweakedHeaderPaths::No, UseLanguageDefines::Yes}; UseTweakedHeaderPaths::No, UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No); compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
QVERIFY(compilerOptionsBuilder.options().contains("/std:c++17")); QVERIFY(compilerOptionsBuilder.options().contains("-clang:std=c++17"));
} }
void CompilerOptionsBuilderTest::testAddWordWidth() void CompilerOptionsBuilderTest::testAddWordWidth()
@@ -633,7 +633,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvc()
[&t](const QString &o) { return o.contains(t.toNative("wrappedQtHeaders/QtCore")); }); [&t](const QString &o) { return o.contains(t.toNative("wrappedQtHeaders/QtCore")); });
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(QStringList{"-nostdinc", "-nostdinc++", "--driver-mode=cl", "/Zs", "-m64", (QStringList{"-nostdinc", "-nostdinc++", "--driver-mode=cl", "/Zs", "-m64",
"--target=x86_64-apple-darwin10", "/TP", "/std:c++17", "--target=x86_64-apple-darwin10", "/TP", "-clang:std=c++17",
"-fms-compatibility-version=19.00", "-DprojectFoo=projectBar", "-fms-compatibility-version=19.00", "-DprojectFoo=projectBar",
"-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"", "-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",
"-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"", "-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"",
@@ -662,7 +662,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvcWithExceptions()
[&t](const QString &o) { return o.contains(t.toNative("wrappedQtHeaders/QtCore")); }); [&t](const QString &o) { return o.contains(t.toNative("wrappedQtHeaders/QtCore")); });
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(QStringList{"-nostdinc", "-nostdinc++", "--driver-mode=cl", "/Zs", "-m64", (QStringList{"-nostdinc", "-nostdinc++", "--driver-mode=cl", "/Zs", "-m64",
"--target=x86_64-apple-darwin10", "/TP", "/std:c++17", "-fcxx-exceptions", "--target=x86_64-apple-darwin10", "/TP", "-clang:std=c++17", "-fcxx-exceptions",
"-fexceptions", "-fms-compatibility-version=19.00", "-fexceptions", "-fms-compatibility-version=19.00",
"-DprojectFoo=projectBar", "-DprojectFoo=projectBar",
"-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"", "-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",

1
src/plugins/cppeditor/cppcompletionassist.h
View File

@@ -194,6 +194,7 @@ public:
{ getCppSpecifics(); return m_headerPaths; } { getCppSpecifics(); return m_headerPaths; }
CPlusPlus::LanguageFeatures languageFeatures() const CPlusPlus::LanguageFeatures languageFeatures() const
{ getCppSpecifics(); return m_languageFeatures; } { getCppSpecifics(); return m_languageFeatures; }
bool isBaseObject() const override { return false; }
private: private:
void getCppSpecifics() const; void getCppSpecifics() const;

27
src/plugins/cppeditor/cppeditorwidget.cpp
View File

@@ -1163,22 +1163,43 @@ void CppEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo,
updateFunctionDeclDefLink(); updateFunctionDeclDefLink();
} }
bool CppEditorWidget::isOldStyleSignalOrSlot() const
{
QTextCursor tc(textCursor());
const QString content = textDocument()->plainText();
return CppEditor::CppModelManager::instance()
->getSignalSlotType(textDocument()->filePath().toString(),
content.toUtf8(),
tc.position())
== CppEditor::SignalSlotType::OldStyleSignal;
}
AssistInterface *CppEditorWidget::createAssistInterface(AssistKind kind, AssistReason reason) const AssistInterface *CppEditorWidget::createAssistInterface(AssistKind kind, AssistReason reason) const
{ {
if (kind == Completion || kind == FunctionHint) { if (kind == Completion || kind == FunctionHint) {
CppCompletionAssistProvider * const cap = kind == Completion CppCompletionAssistProvider * const cap = kind == Completion
? qobject_cast<CppCompletionAssistProvider *>(cppEditorDocument()->completionAssistProvider()) ? qobject_cast<CppCompletionAssistProvider *>(cppEditorDocument()->completionAssistProvider())
: qobject_cast<CppCompletionAssistProvider *>(cppEditorDocument()->functionHintAssistProvider()); : qobject_cast<CppCompletionAssistProvider *>(cppEditorDocument()->functionHintAssistProvider());
if (cap) {
auto getFeatures = [this]() {
LanguageFeatures features = LanguageFeatures::defaultFeatures(); LanguageFeatures features = LanguageFeatures::defaultFeatures();
if (Document::Ptr doc = d->m_lastSemanticInfo.doc) if (Document::Ptr doc = d->m_lastSemanticInfo.doc)
features = doc->languageFeatures(); features = doc->languageFeatures();
features.objCEnabled |= cppEditorDocument()->isObjCEnabled(); features.objCEnabled |= cppEditorDocument()->isObjCEnabled();
return features;
};
if (cap)
return cap->createAssistInterface(textDocument()->filePath(), return cap->createAssistInterface(textDocument()->filePath(),
this, this,
features, getFeatures(),
reason); reason);
} else { else {
if (isOldStyleSignalOrSlot())
return CppModelManager::instance()
->completionAssistProvider()
->createAssistInterface(textDocument()->filePath(), this, getFeatures(), reason);
return TextEditorWidget::createAssistInterface(kind, reason); return TextEditorWidget::createAssistInterface(kind, reason);
} }
} else if (kind == QuickFix) { } else if (kind == QuickFix) {

1
src/plugins/cppeditor/cppeditorwidget.h
View File

@@ -146,6 +146,7 @@ private:
void finalizeInitializationAfterDuplication(TextEditorWidget *other) override; void finalizeInitializationAfterDuplication(TextEditorWidget *other) override;
unsigned documentRevision() const; unsigned documentRevision() const;
bool isOldStyleSignalOrSlot() const;
QMenu *createRefactorMenu(QWidget *parent) const; QMenu *createRefactorMenu(QWidget *parent) const;

82
src/plugins/cppeditor/cppmodelmanager.cpp
View File

@@ -52,6 +52,7 @@
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <cplusplus/ASTPath.h> #include <cplusplus/ASTPath.h>
#include <cplusplus/ExpressionUnderCursor.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
@@ -338,11 +339,29 @@ void CppModelManager::switchHeaderSource(bool inNextSplit, Backend backend)
inNextSplit); inNextSplit);
} }
bool CppModelManager::positionRequiresSignal(const QString &filePath, const QByteArray &content, int argumentPositionOf(const AST *last, const CallAST *callAst)
int position) const {
if (!callAst || !callAst->expression_list)
return false;
int num = 0;
for (ExpressionListAST *it = callAst->expression_list; it; it = it->next) {
++num;
const ExpressionAST *const arg = it->value;
if (arg->firstToken() <= last->firstToken()
&& arg->lastToken() >= last->lastToken()) {
return num;
}
}
return 0;
}
SignalSlotType CppModelManager::getSignalSlotType(const QString &filePath,
const QByteArray &content,
int position) const
{ {
if (content.isEmpty()) if (content.isEmpty())
return false; return SignalSlotType::None;
// Insert a dummy prefix if we don't have a real one. Otherwise the AST path will not contain // Insert a dummy prefix if we don't have a real one. Otherwise the AST path will not contain
// anything after the CallAST. // anything after the CallAST.
@@ -360,26 +379,17 @@ bool CppModelManager::positionRequiresSignal(const QString &filePath, const QByt
// Are we at the second argument of a function call? // Are we at the second argument of a function call?
const QList<AST *> path = ASTPath(document)(cursor); const QList<AST *> path = ASTPath(document)(cursor);
if (path.isEmpty() || !path.last()->asSimpleName()) if (path.isEmpty())
return false; return SignalSlotType::None;
const CallAST *callAst = nullptr; const CallAST *callAst = nullptr;
for (auto it = path.crbegin(); it != path.crend(); ++it) { for (auto it = path.crbegin(); it != path.crend(); ++it) {
if ((callAst = (*it)->asCall())) if ((callAst = (*it)->asCall()))
break; break;
} }
if (!callAst)
return false;
if (!callAst->expression_list || !callAst->expression_list->next)
return false;
const ExpressionAST * const secondArg = callAst->expression_list->next->value;
if (secondArg->firstToken() > path.last()->firstToken()
|| secondArg->lastToken() < path.last()->lastToken()) {
return false;
}
// Is the function called "connect" or "disconnect"? // Is the function called "connect" or "disconnect"?
if (!callAst->base_expression) if (!callAst || !callAst->base_expression)
return false; return SignalSlotType::None;
Scope *scope = document->globalNamespace(); Scope *scope = document->globalNamespace();
for (auto it = path.crbegin(); it != path.crend(); ++it) { for (auto it = path.crbegin(); it != path.crend(); ++it) {
if (const CompoundStatementAST * const stmtAst = (*it)->asCompoundStatement()) { if (const CompoundStatementAST * const stmtAst = (*it)->asCompoundStatement()) {
@@ -398,7 +408,7 @@ bool CppModelManager::positionRequiresSignal(const QString &filePath, const QByt
exprType.init(document, snapshot); exprType.init(document, snapshot);
const QList<LookupItem> typeMatches = exprType(ast->base_expression, document, scope); const QList<LookupItem> typeMatches = exprType(ast->base_expression, document, scope);
if (typeMatches.isEmpty()) if (typeMatches.isEmpty())
return false; return SignalSlotType::None;
const std::function<const NamedType *(const FullySpecifiedType &)> getNamedType const std::function<const NamedType *(const FullySpecifiedType &)> getNamedType
= [&getNamedType](const FullySpecifiedType &type ) -> const NamedType * { = [&getNamedType](const FullySpecifiedType &type ) -> const NamedType * {
Type * const t = type.type(); Type * const t = type.type();
@@ -414,22 +424,22 @@ bool CppModelManager::positionRequiresSignal(const QString &filePath, const QByt
if (!namedType && typeMatches.first().declaration()) if (!namedType && typeMatches.first().declaration())
namedType = getNamedType(typeMatches.first().declaration()->type()); namedType = getNamedType(typeMatches.first().declaration()->type());
if (!namedType) if (!namedType)
return false; return SignalSlotType::None;
const ClassOrNamespace * const result = context.lookupType(namedType->name(), scope); const ClassOrNamespace * const result = context.lookupType(namedType->name(), scope);
if (!result) if (!result)
return false; return SignalSlotType::None;
scope = result->rootClass(); scope = result->rootClass();
if (!scope) if (!scope)
return false; return SignalSlotType::None;
} }
if (!nameAst || !nameAst->name) if (!nameAst || !nameAst->name)
return false; return SignalSlotType::None;
const Identifier * const id = nameAst->name->identifier(); const Identifier * const id = nameAst->name->identifier();
if (!id) if (!id)
return false; return SignalSlotType::None;
const QString funcName = QString::fromUtf8(id->chars(), id->size()); const QString funcName = QString::fromUtf8(id->chars(), id->size());
if (funcName != "connect" && funcName != "disconnect") if (funcName != "connect" && funcName != "disconnect")
return false; return SignalSlotType::None;
// Is the function a member function of QObject? // Is the function a member function of QObject?
const QList<LookupItem> matches = context.lookup(nameAst->name, scope); const QList<LookupItem> matches = context.lookup(nameAst->name, scope);
@@ -440,11 +450,29 @@ bool CppModelManager::positionRequiresSignal(const QString &filePath, const QByt
if (!klass || !klass->name()) if (!klass || !klass->name())
continue; continue;
const Identifier * const classId = klass->name()->identifier(); const Identifier * const classId = klass->name()->identifier();
if (classId && QString::fromUtf8(classId->chars(), classId->size()) == "QObject") if (classId && QString::fromUtf8(classId->chars(), classId->size()) == "QObject") {
return true; QString expression;
} LanguageFeatures features = LanguageFeatures::defaultFeatures();
CPlusPlus::ExpressionUnderCursor expressionUnderCursor(features);
for (int i = cursor.position(); i > 0; --i)
if (textDocument.characterAt(i) == '(') {
cursor.setPosition(i);
break;
}
return false; expression = expressionUnderCursor(cursor);
const int argumentPosition = argumentPositionOf(path.last(), callAst);
if ((expression.endsWith(QLatin1String("SIGNAL"))
&& (argumentPosition == 2 || argumentPosition == 4))
|| (expression.endsWith(QLatin1String("SLOT")) && argumentPosition == 4))
return SignalSlotType::OldStyleSignal;
if (argumentPosition == 2)
return SignalSlotType::NewStyleSignal;
}
}
return SignalSlotType::None;
} }
FollowSymbolUnderCursor &CppModelManager::builtinFollowSymbol() FollowSymbolUnderCursor &CppModelManager::builtinFollowSymbol()

17
src/plugins/cppeditor/cppmodelmanager.h
View File

@@ -45,7 +45,11 @@ namespace Core {
class IDocument; class IDocument;
class IEditor; class IEditor;
} }
namespace CPlusPlus { class LookupContext; } namespace CPlusPlus {
class AST;
class CallAST;
class LookupContext;
} // namespace CPlusPlus
namespace ProjectExplorer { class Project; } namespace ProjectExplorer { class Project; }
namespace TextEditor { namespace TextEditor {
class BaseHoverHandler; class BaseHoverHandler;
@@ -75,6 +79,12 @@ class CppModelManagerPrivate;
namespace Tests { class ModelManagerTestHelper; } namespace Tests { class ModelManagerTestHelper; }
enum class SignalSlotType {
OldStyleSignal,
NewStyleSignal,
None
};
class CPPEDITOR_EXPORT CppModelManager final : public CPlusPlus::CppModelManagerBase class CPPEDITOR_EXPORT CppModelManager final : public CPlusPlus::CppModelManagerBase
{ {
Q_OBJECT Q_OBJECT
@@ -154,8 +164,9 @@ public:
QList<int> references(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context); QList<int> references(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context);
bool positionRequiresSignal(const QString &filePath, const QByteArray &content, SignalSlotType getSignalSlotType(const QString &filePath,
int position) const; const QByteArray &content,
int position) const;
void renameUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context, void renameUsages(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context,
const QString &replacement = QString()); const QString &replacement = QString());

1
src/plugins/cppeditor/cppquickfixassistant.h
View File

@@ -56,6 +56,7 @@ public:
bool isCursorOn(unsigned tokenIndex) const; bool isCursorOn(unsigned tokenIndex) const;
bool isCursorOn(const CPlusPlus::AST *ast) const; bool isCursorOn(const CPlusPlus::AST *ast) const;
bool isBaseObject() const override { return false; }
private: private:
CppEditorWidget *m_editor; CppEditorWidget *m_editor;

6
src/plugins/cppeditor/cpptoolsreuse.cpp
View File

@@ -28,6 +28,7 @@
#include "clangdiagnosticconfigsmodel.h" #include "clangdiagnosticconfigsmodel.h"
#include "cppautocompleter.h" #include "cppautocompleter.h"
#include "cppcodemodelsettings.h" #include "cppcodemodelsettings.h"
#include "cppcompletionassist.h"
#include "cppeditorconstants.h" #include "cppeditorconstants.h"
#include "cppeditorplugin.h" #include "cppeditorplugin.h"
#include "cpphighlighter.h" #include "cpphighlighter.h"
@@ -336,6 +337,11 @@ TextEditor::QuickFixOperations quickFixOperations(const TextEditor::AssistInterf
return Internal::quickFixOperations(interface); return Internal::quickFixOperations(interface);
} }
CppCompletionAssistProcessor *getCppCompletionAssistProcessor()
{
return new Internal::InternalCppCompletionAssistProcessor();
}
CppCodeModelSettings *codeModelSettings() CppCodeModelSettings *codeModelSettings()
{ {
return Internal::CppEditorPlugin::instance()->codeModelSettings(); return Internal::CppEditorPlugin::instance()->codeModelSettings();

3
src/plugins/cppeditor/cpptoolsreuse.h
View File

@@ -55,6 +55,7 @@ namespace TextEditor { class AssistInterface; }
namespace CppEditor { namespace CppEditor {
class CppRefactoringFile; class CppRefactoringFile;
class ProjectInfo; class ProjectInfo;
class CppCompletionAssistProcessor;
void CPPEDITOR_EXPORT moveCursorToEndOfIdentifier(QTextCursor *tc); void CPPEDITOR_EXPORT moveCursorToEndOfIdentifier(QTextCursor *tc);
void CPPEDITOR_EXPORT moveCursorToStartOfIdentifier(QTextCursor *tc); void CPPEDITOR_EXPORT moveCursorToStartOfIdentifier(QTextCursor *tc);
@@ -80,6 +81,8 @@ bool CPPEDITOR_EXPORT isInCommentOrString(const TextEditor::AssistInterface *int
TextEditor::QuickFixOperations CPPEDITOR_EXPORT TextEditor::QuickFixOperations CPPEDITOR_EXPORT
quickFixOperations(const TextEditor::AssistInterface *interface); quickFixOperations(const TextEditor::AssistInterface *interface);
CppCompletionAssistProcessor CPPEDITOR_EXPORT *getCppCompletionAssistProcessor();
enum class CacheUsage { ReadWrite, ReadOnly }; enum class CacheUsage { ReadWrite, ReadOnly };
QString CPPEDITOR_EXPORT correspondingHeaderOrSource(const QString &fileName, bool *wasHeader = nullptr, QString CPPEDITOR_EXPORT correspondingHeaderOrSource(const QString &fileName, bool *wasHeader = nullptr,

1
src/plugins/glsleditor/glslcompletionassist.h
View File

@@ -114,6 +114,7 @@ public:
const QString &mimeType() const { return m_mimeType; } const QString &mimeType() const { return m_mimeType; }
const Document::Ptr &glslDocument() const { return m_glslDoc; } const Document::Ptr &glslDocument() const { return m_glslDoc; }
bool isBaseObject() const override { return false; }
private: private:
QString m_mimeType; QString m_mimeType;

5
src/plugins/languageclient/client.cpp
View File

@@ -639,7 +639,8 @@ void Client::sendMessage(const JsonRpcMessage &message, SendDocUpdates sendUpdat
void Client::cancelRequest(const MessageId &id) void Client::cancelRequest(const MessageId &id)
{ {
d->m_responseHandlers.remove(id); d->m_responseHandlers.remove(id);
sendMessage(CancelRequest(CancelParameter(id)), SendDocUpdates::Ignore); if (reachable())
sendMessage(CancelRequest(CancelParameter(id)), SendDocUpdates::Ignore);
} }
void Client::closeDocument(TextEditor::TextDocument *document) void Client::closeDocument(TextEditor::TextDocument *document)
@@ -1646,7 +1647,7 @@ void ClientPrivate::sendPostponedDocumentUpdates(Schedule semanticTokensSchedule
void ClientPrivate::handleResponse(const MessageId &id, const JsonRpcMessage &message) void ClientPrivate::handleResponse(const MessageId &id, const JsonRpcMessage &message)
{ {
if (auto handler = m_responseHandlers[id]) if (auto handler = m_responseHandlers.take(id))
handler(message); handler(message);
} }

5
src/plugins/languageclient/languageclienthoverhandler.cpp
View File

@@ -49,9 +49,10 @@ HoverHandler::~HoverHandler()
void HoverHandler::abort() void HoverHandler::abort()
{ {
if (m_client && m_client->reachable() && m_currentRequest.has_value()) if (m_client && m_currentRequest.has_value()) {
m_client->cancelRequest(*m_currentRequest); m_client->cancelRequest(*m_currentRequest);
m_currentRequest.reset(); m_currentRequest.reset();
}
m_response = {}; m_response = {};
} }

2
src/plugins/mesonprojectmanager/CMakeLists.txt
View File

@@ -91,6 +91,7 @@ file(RELATIVE_PATH TEST_RELATIVE_LIBEXEC_PATH "/${RELATIVE_TEST_PATH}" "/${IDE_L
if(WITH_TESTS) if(WITH_TESTS)
add_qtc_test(tst_mesonwrapper add_qtc_test(tst_mesonwrapper
EXCLUDE_FROM_PRECHECK
INCLUDES INCLUDES
BEFORE "." BEFORE "."
DEPENDS DEPENDS
@@ -111,6 +112,7 @@ add_qtc_test(tst_mesonwrapper
) )
add_qtc_test(tst_mesoninfoparser add_qtc_test(tst_mesoninfoparser
EXCLUDE_FROM_PRECHECK
INCLUDES INCLUDES
BEFORE "." BEFORE "."
DEPENDS DEPENDS

Some files were not shown because too many files have changed in this diff Show More