diff --git a/doc/qtcreator/examples/accelbubble/CMakeLists.txt b/doc/qtcreator/examples/accelbubble/CMakeLists.txt index 5210b67a25f..868e5ea1331 100644 --- a/doc/qtcreator/examples/accelbubble/CMakeLists.txt +++ b/doc/qtcreator/examples/accelbubble/CMakeLists.txt @@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 3.16) project(accelbubble VERSION 0.1 LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt6 6.2 COMPONENTS Quick Sensors Svg Xml REQUIRED) +find_package(Qt6 6.4 REQUIRED COMPONENTS Quick Sensors Svg Xml) + +qt_standard_project_setup() qt_add_executable(appaccelbubble main.cpp @@ -15,7 +16,7 @@ qt_add_executable(appaccelbubble qt_add_qml_module(appaccelbubble URI accelbubble VERSION 1.0 - QML_FILES main.qml + QML_FILES Main.qml RESOURCES Bluebubble.svg ) @@ -37,4 +38,8 @@ target_compile_definitions(appaccelbubble target_link_libraries(appaccelbubble PRIVATE Qt6::Quick Qt6::Sensors Qt6::Svg Qt6::Xml) +install(TARGETS appaccelbubble + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + qt_finalize_executable(appaccelbubble) diff --git a/doc/qtcreator/examples/transitions/CMakeLists.txt b/doc/qtcreator/examples/transitions/CMakeLists.txt index 1ebc965be55..3dec945039b 100644 --- a/doc/qtcreator/examples/transitions/CMakeLists.txt +++ b/doc/qtcreator/examples/transitions/CMakeLists.txt @@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 3.16) project(transitions VERSION 0.1 LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt6 6.2 COMPONENTS Quick REQUIRED) +find_package(Qt6 6.4 REQUIRED COMPONENTS Quick) + +qt_standard_project_setup() qt_add_executable(apptransitions main.cpp @@ -14,7 +15,7 @@ qt_add_executable(apptransitions qt_add_qml_module(apptransitions URI transitions VERSION 1.0 - QML_FILES main.qml Page.qml + QML_FILES Main.qml Page.qml RESOURCES qt-logo.png ) @@ -26,7 +27,10 @@ set_target_properties(apptransitions PROPERTIES WIN32_EXECUTABLE TRUE ) -target_compile_definitions(apptransitions - PRIVATE $<$,$>:QT_QML_DEBUG>) target_link_libraries(apptransitions - PRIVATE Qt6::Quick) + PRIVATE Qt6::Quick +) + +install(TARGETS apptransitions + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/doc/qtcreator/images/qtcreator-new-project.png b/doc/qtcreator/images/qtcreator-new-project.png deleted file mode 100644 index c1d2a371136..00000000000 Binary files a/doc/qtcreator/images/qtcreator-new-project.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-new-project.webp b/doc/qtcreator/images/qtcreator-new-project.webp new file mode 100644 index 00000000000..1c0570b8b61 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-new-project.webp differ diff --git a/doc/qtcreator/images/qtcreator-new-qt-quick-project.png b/doc/qtcreator/images/qtcreator-new-qt-quick-project.png deleted file mode 100644 index ec773f7f5fe..00000000000 Binary files a/doc/qtcreator/images/qtcreator-new-qt-quick-project.png and /dev/null differ diff --git a/doc/qtcreator/images/qtcreator-project-qt-quick-details.webp b/doc/qtcreator/images/qtcreator-project-qt-quick-details.webp new file mode 100644 index 00000000000..ab33bfb8350 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-project-qt-quick-details.webp differ diff --git a/doc/qtcreator/images/qtcreator-project-qt-quick.webp b/doc/qtcreator/images/qtcreator-project-qt-quick.webp new file mode 100644 index 00000000000..48a83d2dda2 Binary files /dev/null and b/doc/qtcreator/images/qtcreator-project-qt-quick.webp differ diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc index a4ec2eabecf..c0768899210 100644 --- a/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc +++ b/doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc @@ -58,7 +58,7 @@ In the first step, you select a template for the project. You can filter templates (1) to view only those that apply to a particular target platform. - \image qtcreator-new-project.png + \image qtcreator-new-project.webp {New Project dialog} Next, you select a location for the project and specify settings for it. @@ -95,9 +95,12 @@ \li Uses a single main.cpp file. \row \li Qt Quick Application - \li Creates a Qt Quick 2 application project that can have both + \li Creates a Qt Quick application project that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms. + + You can select an option to create a project that you can open + in \QDS, which has a visual editor for Qt Quick UIs. \row \li {1,4} Application (Qt for Python) \li Empty Application @@ -129,7 +132,7 @@ \row \li Qt Quick 2 Extension Plugin \li Creates a C++ plugin that makes it possible to offer extensions - that the QQmlEngine class can load dynamically into Qt Quick 2 + that the QQmlEngine class can load dynamically into Qt Quick applications. \row \li \QC Plugin @@ -142,7 +145,7 @@ \li Qt Quick UI Prototype \li Creates a \l{Creating Qt Quick UI Projects}{Qt Quick UI project} with a single QML file that has the main view. You can - preview Qt Quick 2 UI projects in the + preview Qt Quick UI projects in the \l{Validating with Target Hardware}{QML Scene preview tool}. You do not need to build them because they do not have any C++ code. @@ -333,7 +336,7 @@ \uicontrol {New Subproject}. Follow the steps in the \uicontrol {New Subproject} wizard to create a subproject. - \image qtcreator-new-qt-quick-project.png + \image qtcreator-project-qt-quick.webp {New Project dialog} To add an existing project as a subproject, select \uicontrol {Add Existing Projects} in the context menu. diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc index da87315bd5c..4aca5466c39 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc @@ -22,12 +22,12 @@ For more examples, see \l{Qt Quick Examples and Tutorials}. - You can develop Qt Quick applications also in \QDS. For more information, - see \l{Qt Design Studio Manual}. + You can use a visual editor to develop Qt Quick applications in \QDS. For + more information, see \l{Qt Design Studio Manual}. \include qtquick-tutorial-create-empty-project.qdocinc qtquick empty application - \QC generates a component file, \e main.qml, and opens it in the + \QC generates a component file, \e Main.qml, and opens it in the \uicontrol Edit mode. \section1 Deploying Applications diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc index f10e1b7afb9..af5f9ac321b 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc @@ -14,8 +14,6 @@ \title Creating Qt Quick Projects - \image qtcreator-new-qt-quick-project.png "New Project dialog" - The following table lists the wizard templates for creating a new Qt Quick project from scratch. @@ -27,9 +25,12 @@ \row \li Application (Qt) \li Qt Quick Application - \li Creates a Qt Quick 2 application project that can have both + \li Creates a Qt Quick application project that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms. + + You can select an option to create a project that you can open + in \QDS. \row \li Application (Qt for Python) \li Qt for Python - Qt Quick Application @@ -39,7 +40,7 @@ \li Other Project \li Qt Quick UI Prototype \li Creates a Qt Quick UI project with a single QML file that - has the main view. You can preview Qt Quick 2 UI projects + has the main view. You can preview Qt Quick UI projects in the QML Scene preview tool. You do not need to build them because they do not have any C++ code. @@ -47,14 +48,14 @@ template only if you are prototyping. You cannot create a full application by using this template. - Qt Quick UI projects cannot be deployed to embedded or mobile - target platforms. For those platforms, create a Qt Quick + You cannot deploy Qt Quick UI projects to embedded or + mobile target platforms. For those platforms, create a Qt Quick application instead. \row \li Library \li Qt Quick 2 Extension Plugin \li Creates C++ plugins that make it possible to offer extensions - that can be loaded dynamically into Qt Quick 2 applications. + that can be loaded dynamically into Qt Quick applications. \endtable \note The SDK for a particular target platform might install additional @@ -72,6 +73,8 @@ \uicontrol {Application (Qt)} > \uicontrol {Qt Quick Application} > \uicontrol Choose. + \image qtcreator-project-qt-quick.webp {New Project dialog} + \li In the \uicontrol {Project Location} dialog, \uicontrol Name field, enter a name for the project. Keep in mind that you cannot easily change the project name later. @@ -84,6 +87,11 @@ \li Select \uicontrol Next (or \uicontrol Continue on \macos) to open the \uicontrol {Define Build System} dialog. + \image qtcreator-project-qt-quick-details.webp {Define Project Details dialog} + + To create a project that you can develop with a visual editor in + \QDS, select \uicontrol {Create a project that you can open in \QDS}. + \li In the \uicontrol {Build system} field, select the build system to use for building and running the project: \l qmake, \l {Setting Up CMake}{CMake}, or \l {Setting Up Qbs}{Qbs}. @@ -101,20 +109,9 @@ \note If you have not installed the Qt Virtual Keyboard module when you installed Qt, an error message will appear when you try to open - \e main.qml for editing. You can use the \l {Installing Qt} + \e Main.qml for editing. You can use the \l {Installing Qt} {Qt Maintenance Tool} to install Qt Virtual Keyboard. - \li Select \uicontrol Next to open the \uicontrol {Translation File} - dialog. - - \li In the \uicontrol Language field, select a language that you plan - to \l {Using Qt Linguist}{translate} the application to. You can - add other languages later by editing the project file. - - \li In the \uicontrol {Translation file} field, you can edit the - name for the translation source file that will be generated - for the selected language. - \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog. @@ -136,7 +133,7 @@ \endlist - \QC creates a QML file, \e main.qml, that you can modify in the + \QC creates a QML file, \e Main.qml, that you can modify in the \uicontrol Edit mode. \include creator-python-project.qdocinc python qml project wizards diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc index e1f5e5491de..5c933d5305d 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc @@ -11,6 +11,8 @@ \li Select \uicontrol File > \uicontrol {New Project} > \uicontrol {Application (Qt)} > \uicontrol {Qt Quick Application}. + \image qtcreator-project-qt-quick.webp {New Project dialog} + \li Select \uicontrol Choose to open the \uicontrol {Project Location} dialog. @@ -34,16 +36,20 @@ \li Select \uicontrol Next to open the \uicontrol {Define Project Details} dialog. - \li In the \uicontrol {Minimum required Qt version} field, select - Qt 6.2. + \image qtcreator-project-qt-quick-details.webp {Define Project Details dialog} - \li Select \uicontrol Next to open the \uicontrol {Translation File} - dialog. + \li In the \uicontrol {Minimum required Qt version} field, select + Qt 6.4. + + \note This tutorial shows you how to create the application in the + \uicontrol Edit mode. If you select + \uicontrol {Create a project that you can open in \QDS}, the + following instructions won't apply. \li Select \uicontrol Next to use the default settings and to open the \uicontrol {Kit Selection} dialog. - \li Select Qt 6.2 or later \l{glossary-buildandrun-kit}{kits} for the + \li Select Qt 6.4 or later \l{glossary-buildandrun-kit}{kits} for the platforms that you want to build the application for. To build applications for mobile devices, select kits also for Android and iOS. diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc index 7208ad333e3..b89ff1442b3 100644 --- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc @@ -29,7 +29,8 @@ \note Since \QDS 2.3.0, \QDS project wizard templates generate projects that can be built with CMake. You can open the \e CMakeLists.txt project file in - Qt Creator to continue developing the project. + Qt Creator to continue developing the project. Also, you can use Qt Creator + to create a Qt Quick Application project that you can open in \QDS. \target wizard-template-note \note Since \QDS 3.9.0, \QDS project wizard templates generate projects that diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py index 8e5241e934a..f19d8dedf9b 100644 --- a/share/qtcreator/debugger/cdbbridge.py +++ b/share/qtcreator/debugger/cdbbridge.py @@ -118,6 +118,7 @@ class Dumper(DumperBase): val.isBaseClass = val.name == val._type.name val.nativeValue = nativeValue val.laddress = nativeValue.address() + val.lbitsize = nativeValue.bitsize() return val def nativeTypeId(self, nativeType): diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py index 47b0076cf40..1c1d72fc1aa 100644 --- a/share/qtcreator/debugger/dumper.py +++ b/share/qtcreator/debugger/dumper.py @@ -2798,6 +2798,8 @@ class DumperBase(): return self.putAddress(value.address()) + if value.lbitsize is not None: + self.putField('size', value.lbitsize // 8) if typeobj.code == TypeCode.Function: #DumperBase.warn('FUNCTION VALUE: %s' % value) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 2cdf900d78e..5a406c03190 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -418,7 +418,24 @@ def qdump__QDir(d, value): d.putExpandable() privAddress = d.extractPointer(value) bit32 = d.ptrSize() == 4 - qt5 = d.qtVersion() >= 0x050000 + + # change fc3942114da adds FileCache + # QStringList nameFilters; + # QDir::SortFlags sort; + # QDir::Filters filters; + # std::unique_ptr fileEngine; + # QFileSystemEntry dirEntry; + # struct FileCache + # { + # QMutex mutex; + # QStringList files; + # QFileInfoList fileInfos; + # std::atomic fileListsInitialized = false; + # QFileSystemEntry absoluteDirEntry; + # QFileSystemMetaData metaData; + # }; + # mutable FileCache fileCache; + # Change 9fc0965 reorders members again. # bool fileListsInitialized @@ -454,7 +471,9 @@ def qdump__QDir(d, value): # + 2 byte padding fileSystemEntrySize = 2 * d.ptrSize() + 8 - if d.qtVersion() >= 0x060000: + if d.qtVersion() >= 0x060600: + case = 3 + elif d.qtVersion() >= 0x060000: case = 2 elif d.qtVersion() >= 0x050300: case = 1 @@ -467,7 +486,20 @@ def qdump__QDir(d, value): firstValue = d.extractInt(privAddress + d.ptrSize()) case = 1 if firstValue == 0 or firstValue == 1 else 0 - if case == 2: + if case == 3: + if bit32: + dirEntryOffset = 24 + fileCacheOffset = 52 + filesOffset = fileCacheOffset + 4 + fileInfosOffset = fileCacheOffset + 16 + absoluteDirEntryOffset = fileCacheOffset + 32 + else: + dirEntryOffset = 48 + fileCacheOffset = 104 + filesOffset = fileCacheOffset + 8 + fileInfosOffset = fileCacheOffset + 32 + absoluteDirEntryOffset = fileCacheOffset + 64 + elif case == 2: if bit32: filesOffset = 4 fileInfosOffset = 16 @@ -507,6 +539,7 @@ def qdump__QDir(d, value): d.call('int', value, 'count') # Fill cache. except: pass + #d.putCallItem('absolutePath', '@QString', value, 'absolutePath') #d.putCallItem('canonicalPath', '@QString', value, 'canonicalPath') with SubItem(d, 'absolutePath'): diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index c4e60b55830..ba78031390d 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -264,11 +264,11 @@ Name: - 名称: + 名称： SD card size: - SD卡容量: + SD卡容量： MiB @@ -284,11 +284,11 @@ Password: - 密码: + 密码： Retype password: - 再次输入密码: + 再次输入密码： Show password @@ -300,15 +300,15 @@ Alias name: - 别名: + 别名： Keysize: - 密钥长度: + 密钥长度： Validity (days): - 有效期(天数): + 有效期(天数)： Certificate Distinguished Names @@ -325,19 +325,19 @@ Organization (e.g. KDE): - 组织(如KDE): + 组织(如KDE)： City or locality: - 城市或地点: + 城市或地点： State or province: - 州或省: + 州或省： Two-letter country code for this unit (e.g. RO): - 单位的两字母的国家代码(如RO): + 单位的两字母的国家代码(如RO)： Application @@ -361,11 +361,11 @@ Keystore: - 密钥存储库: + 密钥存储库： Certificate alias: - 证书别名: + 证书别名： Android Configuration @@ -373,7 +373,7 @@ Android SDK location: - Android SDK的路径: + Android SDK的路径： Keystore files (*.keystore *.jks) @@ -1106,7 +1106,7 @@ This cannot be undone. Package name: - 包名称: + 包名称： The package name is not valid. @@ -1118,7 +1118,7 @@ This cannot be undone. Version name: - 版本名称: + 版本名称： Sets the minimum required version on which this application can be run. @@ -3352,15 +3352,15 @@ This might cause trouble during execution. Executable: - 执行档: + 执行档： Arguments: - 参数: + 参数： Working Directory: - 工作目录: + 工作目录： Omit internal messages @@ -3446,7 +3446,7 @@ Warning: this is an experimental feature and might lead to failing to execute th Timeout: - 超时时间: + 超时时间： Timeout used when executing each test case. @@ -3529,7 +3529,7 @@ Warning: this is an experimental feature and might lead to failing to execute th QtC::AutotoolsProjectManager Arguments: - 参数: + 参数： Configuration unchanged, skipping autogen step. @@ -3575,720 +3575,722 @@ Warning: this is an experimental feature and might lead to failing to execute th BackgroundColorMenuActions Background Color Actions - + 背景颜色菜单项 QtC::BareMetal Cannot debug: Kit has no device. - + 无法调试：套件中没有设备。 No debug server provider found for %1 - + 未找到 %1 的调试服务器提供方 Bare Metal - + 裸机 Bare Metal Device - + 裸机设备 Debug server provider: - + 调试服务器提供方： New Bare Metal Device Configuration Setup - + 新的裸机设备配置设置 Set up Debug Server or Hardware Debugger - + 设置调试服务器或硬件调试器 Name: - 名称: + 名称： Deploy to BareMetal Device - + 部署到裸机设备 Unknown - 未知 + 未知 Custom Executable - 自定义执行档 + 自定义执行档 The remote executable must be set in order to run a custom remote run configuration. - + 为了运行自定义远程运行配置，必须设置远程可执行程序。 Manage... - 管理... + 管理... None - 无 + 无 Not recognized - + 未识别 GDB - GDB + GDB UVSC - + UVSC GDB compatible provider engine (used together with the GDB debuggers). - + GDB 兼容提供者引擎 +(与 GDB 调试器一起使用)。 UVSC compatible provider engine (used together with the KEIL uVision). - + UVSC 兼容提供者引擎 +(与 KEIL uVision 一起使用)。 Name - + 名称 Type - 类型 + 类型 Engine - + 引擎 Duplicate Providers Detected - + 检测到重复提供者 The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. - + 以下提供者已经配置：<br>&nbsp;%1<br>它们不会再次配置。 Add - 添加 + 添加 Clone - 克隆 + 克隆 Remove - 删除 + 删除 Debug Server Providers - + 调试服务器提供者 Clone of %1 - %1 的克隆 + %1 的克隆 EBlink - + EBlink Host: - 主机: + 主机： Executable file: - + 可执行文件： Script file: - + 脚本文件： Specify the verbosity level (0 to 7). - + 指定详细级别（0 到 7）。 Verbosity level: - + 详细级别： Connect under reset (hotplug). - + 在重置（热插拔）下连接。 Connect under reset: - + 在重置下连接： Interface type. - + 接口类型。 Type: - 类型: + 类型： Specify the speed of the interface (120 to 8000) in kilohertz (kHz). - + 以千赫（kHz）单位指定接口速度（120 到 8000）。 Speed: - + 速度： Do not use EBlink flash cache. - + 不使用 EBlink 闪存缓存。 Disable cache: - + 禁用缓存： Shut down EBlink server after disconnect. - + 断开连接后关闭 EBlink 服务器。 Auto shutdown: - + 自动关机： Init commands: - + 初始命令： Reset commands: - + 重置命令： SWD - + SWD JTAG - + JTAG Cannot debug: Local executable is not set. - + 无法调试：未设置本地可执行程序。 Cannot debug: Could not find executable for "%1". - + 无法调试：无法找到“%1”的可执行程序。 Choose the desired startup mode of the GDB server provider. - + 选择所需的 GDB 服务器提供方的启动模式。 Startup mode: - + 启动模式： Peripheral description files (*.svd) - + 外设描述文件（*.svd） Select Peripheral Description File - + 选择外设描述文件 Peripheral description file: - + 外设描述文件： Startup in TCP/IP Mode - + 在 TCP/IP 模式下启动 Startup in Pipe Mode - + 在管道模式下启动 Enter GDB commands to reset the board and to write the nonvolatile memory. - + 输入 GDB 命令以重置面板，并写入非易失性存储器。 Enter GDB commands to reset the hardware. The MCU should be halted after these commands. - + 输入 GDB 命令以重置硬件。MCU 应在这些命令后停止。 Generic - + 通用的 Use GDB target extended-remote - + 使用 GDB 目标扩展远程 Extended mode: - + 扩展模式： JLink - + JLink JLink GDB Server (JLinkGDBServerCL.exe) - + JLink GDB 服务器（JLinkGDBServerCL.exe） JLink GDB Server (JLinkGDBServer) - + JLink GDB 服务器（JLinkGDBServer） IP Address - + IP 地址 Host interface: - + 主机接口： Speed - + 速度 Target interface: - + 目标接口： Device: - 设备: + 设备： Additional arguments: - 额外的参数: + 额外的参数： Default - 默认 + 默认 USB - + USB TCP/IP - + TCP/IP Compact JTAG - + 紧凑型 JTAG Renesas RX FINE - + Renesas RX FINE ICSP - + ICSP Auto - + 自动 Adaptive - + 自适应 %1 kHz - + %1 千赫兹 OpenOCD - + OpenOCD Root scripts directory: - + Root 脚本目录： Configuration file: - + 配置文件： ST-LINK Utility - + ST-LINK 实用工具 Specify the verbosity level (0..99). - + 指定详细级别（0 到 99）。 Continue listening for connections after disconnect. - + 在断开连接后继续监听连接。 Reset board on connection. - + 连接上时重置面板。 Reset on connection: - + 连接上时重置： Transport layer type. - + 传输层类型。 Version: - 版本: + 版本： ST-LINK/V1 - + ST-LINK/V1 ST-LINK/V2 - + ST-LINK/V2 Keep unspecified - + 保持未指定 uVision JLink - + uVision JLink Unable to create a uVision project options template. - + 无法创建 uVision 项目选项模板。 Adapter options: - + 适配器选项： Port: - 端口: + 端口： 50MHz - + 50MHz 33MHz - + 33MHz 25MHz - + 25MHz 20MHz - + 20MHz 10MHz - + 10MHz 5MHz - + 5MHz 3MHz - + 3MHz 2MHz - + 2MHz 1MHz - + 1MHz 500kHz - + 500kHz 200kHz - + 200kHz 100kHz - + 100kHz uVision Simulator - + uVision 模拟器 Limit speed to real-time. - + 将速度限制为实时。 Limit speed to real-time: - + 将速度限制为实时： uVision St-Link - + uVision St-Link 9MHz - + 9MHz 4.5MHz - + 4.5MHz 2.25MHz - + 2.25MHz 1.12MHz - + 1.12MHz 560kHz - + 560kHz 280kHz - + 280kHz 140kHz - + 140kHz 4MHz - + 4MHz 1.8MHz - + 1.8MHz 950kHz - + 950kHz 480kHz - + 480kHz 240kHz - + 240kHz 125kHz - + 125kHz 50kHz - + 50kHz 25kHz - + 25kHz 15kHz - + 15kHz 5kHz - + 5kHz Unable to create a uVision project template. - + 无法创建 uVision 项目模板。 Choose Keil Toolset Configuration File - + 选择 Keil 工具集配置文件 Tools file path: - + 工具文件路径： Target device: - + 目标设备： Target driver: - + 目标驱动器： Starting %1 ... - + 启动 %1... Version - 版本 + 版本 Vendor - 销售商 + 销售商 ID - ID + ID Start - + 启动 Size - + 大小 FLASH Start - + 闪存启动 FLASH Size - + 闪存大小 RAM Start - + 内存启动 RAM Size - + 内存大小 Algorithm path. - + 算法路径。 FLASH: - + 闪存： Start address. - + 开始地址。 Size. - + 大小。 RAM: - + 内存： Vendor: - 销售商: + 销售商： Package: - 包: + 包： Description: - 说明: + 说明： Memory: - + 存储器： Flash algorithm: - + 闪存算法： Target device not selected. - + 未选择目标设备。 Available Target Devices - + 可用目标设备 Path - + 路径 Debugger CPU library (depends on a CPU core). - + 调试器 CPU 库（取决于 CPU 内核）。 Debugger driver library. - + 调试器驱动程序库。 Driver library: - + 驱动程序库： CPU library: - + CPU 库： Target driver not selected. - + 未选择目标驱动器。 Available Target Drivers - + 可用目标设备 IAREW %1 (%2, %3) - + IAREW %1 (%2, %3) IAREW - + IAREW &Compiler path: - 编译器路径(&C): + 编译器路径(&C)： Platform codegen flags: - + 平台代码生成标志： &ABI: - &ABI: + &ABI： Enter the name of the debugger server provider. - + 输入调试器服务器提供者的名称。 Enter TCP/IP hostname of the debug server, like "localhost" or "192.0.2.1". - + 输入调试服务器的 TCP/IP 主机名，例如“localhost”或者“192.0.2.1”。 Enter TCP/IP port which will be listened by the debug server. - + 输入调试服务器监听的 TCP/IP 端口。 KEIL %1 (%2, %3) - + KEIL %1 (%2, %3) KEIL - + KEIL SDCC %1 (%2, %3) - + SDCC %1 (%2, %3) SDCC - + SDCC @@ -4302,11 +4304,11 @@ Warning: this is an experimental feature and might lead to failing to execute th QtC::LanguageServerProtocol Cannot decode content with "%1". Falling back to "%2". - + 无法解码包含“%1”的内容，回退到“%2”。 Expected an integer in "%1", but got "%2". - + 期望“%1”中的整数，但得到“%2”。 @@ -4317,7 +4319,7 @@ Warning: this is an experimental feature and might lead to failing to execute th Branch: - 分支: + 分支： Local commit @@ -4329,15 +4331,15 @@ Warning: this is an experimental feature and might lead to failing to execute th Author: - 作者: + 作者： Email: - Email: + Email： Fixed bugs: - 修复的bug: + 修复的bug： Configuration @@ -4345,7 +4347,7 @@ Warning: this is an experimental feature and might lead to failing to execute th Command: - 命令: + 命令： User @@ -4357,7 +4359,7 @@ Warning: this is an experimental feature and might lead to failing to execute th Default username: - 默认用户名: + 默认用户名： Email to use by default on commit. @@ -4365,7 +4367,7 @@ Warning: this is an experimental feature and might lead to failing to execute th Default email: - 默认电子邮件: + 默认电子邮件： Miscellaneous @@ -4373,11 +4375,11 @@ Warning: this is an experimental feature and might lead to failing to execute th Log count: - 日志数: + 日志数： Timeout: - 超时时间: + 超时时间： s @@ -4401,11 +4403,11 @@ Warning: this is an experimental feature and might lead to failing to execute th Local filesystem: - 本地文件系统: + 本地文件系统： Specify URL: - 指定URL: + 指定URL： Options @@ -4429,7 +4431,7 @@ Warning: this is an experimental feature and might lead to failing to execute th Revision: - 修订版本: + 修订版本： Local @@ -4627,352 +4629,356 @@ This flag will allow push to proceed. Ignore Whitespace - 忽略空白 + 忽略 Whitespace Ignore Blank Lines - + 忽略空行 Show files changed in each revision. - + 显示每个修订版本中更改的文件。 Show from oldest to newest. - + 从最旧到最新显示。 Include Merges - + 包含合并 Show merged revisions. - + 显示合并的修订版本。 Moderately Short - + 适度简短 One Line - + 单行 GNU Change Log - + GNU 变更日志 Format - 格式 + 格式 Performs a local commit in a bound branch. Local commits are not pushed to the master branch until a normal commit is performed. - + 在绑定分支中执行本地提交。 +在执行正常提交之前，本地提交不会推送到 master 分支。 &Annotate %1 - + 注释 %1（&A） Annotate &parent revision %1 - + 注释父修订 %1（&p） Uncommit - + 未提交 Keep tags that point to removed revisions - + 保留指向已删除修订的标签 Only remove the commits from the local branch when in a checkout - + 仅在检出时从本地分支中移除提交 If a revision is specified, uncommits revisions to leave the branch at the specified revision. For example, "Revision: 15" will leave the branch at revision 15. - + 如果指定了修订版本，则取消提交修订版以将分支保留在指定的修订版本上。 +例如，“Revision: 15” 会将分支保持在修订记录 15 上。 Last committed - + 最后提交 Dry Run - + 空运行 Test the outcome of removing the last committed revision, without actually removing anything. - + 测试删除最后提交的修订结果，不会实质删除任何内容。 Triggers a Bazaar version control operation. - + 触发 Bazaar 版本控制操作。 Uncommit... - + 未提交... For example: 'https://[user[:pass]@]host[:port]/[path]'. - + 例如：“https://[user[:pass]@]host[:port]/[path]”。 Ignores differences between branches and overwrites unconditionally. - + 无条件地忽略分支和覆盖之间的差。 + Creates the path leading up to the branch if it does not already exist. - + 如果路径尚不存在，则创建指向分支的路径。 Performs a local pull in a bound branch. Local pulls are not applied to the master branch. - + 在绑定分支中执行本地拉取。 +本地拉取不会应用到 master 分支。 QtC::Beautifier Bea&utifier - + 美化器（&u） Beautifier - + 美化器 Artistic Style - + 艺术风格 Uncrustify - + 去壳 Cannot save styles. %1 does not exist. - + 无法保存风格。%1 不存在。 Cannot open file "%1": %2. - + 无法打开“%1”文件：%2。 Cannot save file "%1": %2. - + 无法保存“%1”文件：%2。 No documentation file specified. - + 未指定文档。 Cannot open documentation file "%1". - + 无法打开文档“%1”。 The file "%1" is not a valid documentation file. - + “%1”文件不是有效的文档文件。 Cannot read documentation file "%1": %2. - + 无法读取“%1”文档：%2。 &Artistic Style - + 艺术风格（&A） Options - 选项 + 选项 Use file *.astylerc defined in project files - + 使用项目文件中定义的 *.astylerc 文件 Use specific config file: - + 使用指定配置文件： AStyle (*.astylerc) - + AStyle (*.astylerc) Use file .astylerc or astylerc in HOME - + 使用家目录下的 .astylerc 或者 astylerc 文件 Use customized style: - + 使用自定义风格： Configuration - 配置 + 配置 Artistic Style command: - + 艺术风格命令： Restrict to MIME types: - + 限制为 MIME 类型： Error in Beautifier: %1 - + 美化器错误：%1 Cannot get configuration file for %1. - + 无法获取 %1 的配置文件。 Format &Current File Menu entry - + 格式化当前文件（&C） Format &Selected Text Menu entry - + 格式化所选文本（&S） &Format at Cursor Menu entry - + 格式化光标处（&F） Format &Line(s) Menu entry - + 格式化行（&L） &Disable Formatting for Selected Text Menu entry - + 为所选文本禁用格式化（&D） %1 Command File dialog title for path chooser when choosing binary - + %1 命令 &ClangFormat - + &ClangFormat ClangFormat - + ClangFormat Use predefined style: - + 使用预定义风格： Fallback style: - + 后备风格： Clang Format command: - + Clang Format 命令： Clang Format - + Clang Format Use file uncrustify.cfg defined in project files - + 使用项目文件中定义的 uncrustify.cfg 文件 Use file specific uncrustify.cfg - + 使用指定的 uncrustify.cfg 文件 Uncrustify file (*.cfg) - + Uncrustify 文件（*.cfg） Use file uncrustify.cfg in HOME - + 使用家目录下的 uncrustify.cfg 文件 Format entire file if no text was selected - + 如果未选择文本，格式化整个文件 For action Format Selected Text - + 对于操作格式化所选文本 Uncrustify command: - + Uncrustify 命令： No description available. - + 无可用描述。 Name - + 名称 Value - 值 + 值 Documentation - 文档 + 文档 Documentation for "%1" - + “%1” 的文档 Edit - 编辑 + 编辑 Remove - 删除 + 删除 Add - 添加 + 添加 Add Configuration - + 添加配置 Edit Configuration - + 编辑配置 Enable auto format on file save - + 启动文本保存时的自动格式化 Tool: - + 工具： Restrict to files contained in the current project - + 限制为当前项目中包含的文件 Automatic Formatting on File Save - + 文件保存时自动格式化 General - 概要 + 概要 &Uncrustify - + &Uncrustify @@ -5003,19 +5009,19 @@ Local pulls are not applied to the master branch. Decimal&nbsp;unsigned&nbsp;value: - 十进制&nbsp;无符号&nbsp;数值: + 十进制&nbsp;无符号&nbsp;数值： Decimal&nbsp;signed&nbsp;value: - 十进制&nbsp;有符号&nbsp;数值: + 十进制&nbsp;有符号&nbsp;数值： Previous&nbsp;decimal&nbsp;unsigned&nbsp;value: - 上一个&nbsp;十进制&nbsp;无符号&nbsp;数值: + 上一个&nbsp;十进制&nbsp;无符号&nbsp;数值： Previous&nbsp;decimal&nbsp;signed&nbsp;value: - 上一个&nbsp;十进制&nbsp;有符号&nbsp;数值: + 上一个&nbsp;十进制&nbsp;有符号&nbsp;数值： %1-bit&nbsp;Integer&nbsp;Type @@ -5031,35 +5037,35 @@ Local pulls are not applied to the master branch. Binary&nbsp;value: - 二进制&nbsp;数值: + 二进制&nbsp;数值： Octal&nbsp;value: - 八进制&nbsp;数值: + 八进制&nbsp;数值： Previous&nbsp;binary&nbsp;value: - 上一个&nbsp;二进制&nbsp;数值: + 上一个&nbsp;二进制&nbsp;数值： Previous&nbsp;octal&nbsp;value: - 上一个&nbsp;八进制&nbsp;数值: + 上一个&nbsp;八进制&nbsp;数值： <i>double</i>&nbsp;value: - <i>双精度浮点数</i>&nbsp;数值: + <i>双精度浮点数</i>&nbsp;数值： Previous <i>double</i>&nbsp;value: - 上一个<i>双精度浮点数</i>&nbsp;数值: + 上一个<i>双精度浮点数</i>&nbsp;数值： <i>float</i>&nbsp;value: - <i>浮点数</i>&nbsp;数值: + <i>浮点数</i>&nbsp;数值： Previous <i>float</i>&nbsp;value: - 上一个<i>浮点数</i>&nbsp;数值: + 上一个<i>浮点数</i>&nbsp;数值： Zoom: %1% @@ -5129,11 +5135,11 @@ Local pulls are not applied to the master branch. Bookmark: - 书签: + 书签： Add in folder: - 添加到文件夹: + 添加到文件夹： Bookmarks @@ -5302,7 +5308,7 @@ Local pulls are not applied to the master branch. Line number: - 行号: + 行号： Meta+Shift+M @@ -5436,7 +5442,7 @@ Local pulls are not applied to the master branch. Generator: - 创建器: + 创建器： Run CMake @@ -5448,7 +5454,7 @@ Local pulls are not applied to the master branch. Targets: - 目标: + 目标： Build CMake target @@ -6120,15 +6126,15 @@ Copy the path to the source files to the clipboard? Name: - 名称: + 名称： Path: - 路径: + 路径： Version: - 版本: + 版本： Help file: @@ -6142,10 +6148,6 @@ Copy the path to the source files to the clipboard? Clone 克隆 - - Remove - 删除 - Make Default 设置为默认 @@ -6256,7 +6258,7 @@ Copy the path to the source files to the clipboard? Type: - 类型: + 类型： Select a file for %1 @@ -6695,11 +6697,11 @@ Make sure that CMAKE_BUILD_TYPE variable matches the "Build type" fiel CVS command: - CVS 命令: + CVS 命令： CVS root: - CVS 路径: + CVS 路径： Describe all files matching commit id @@ -6885,7 +6887,7 @@ However, using the relaxed and extended rules means also that no highlighting/co C++ Usages: - C++ 使用: + C++ 使用： Re&name %n files @@ -7004,11 +7006,11 @@ However, using the relaxed and extended rules means also that no highlighting/co Type: - 类型: + 类型： Description: - 说明: + 说明： Location: @@ -7028,7 +7030,7 @@ However, using the relaxed and extended rules means also that no highlighting/co Message: - 消息: + 消息： Web Page @@ -7619,7 +7621,7 @@ Set a valid executable first. &Checkout comment: - Checkout 命令(&C): + Checkout 命令(&C)： &Reserved @@ -7643,7 +7645,7 @@ Set a valid executable first. &Command: - 命令(&C): + 命令(&C)： Diff @@ -7655,7 +7657,7 @@ Set a valid executable first. Arg&uments: - 参数(&U): + 参数(&U)： Miscellaneous @@ -7663,11 +7665,11 @@ Set a valid executable first. &History count: - 历史记录保存的个数(&H): + 历史记录保存的个数(&H)： &Timeout: - 超时时间(&T): + 超时时间(&T)： s @@ -7691,7 +7693,7 @@ Set a valid executable first. &Index only VOBs: - 仅对下列VOB索引(&i): + 仅对下列VOB索引(&i)： ClearCase @@ -7715,11 +7717,11 @@ Set a valid executable first. Created by: - 创建人: + 创建人： Created on: - 创建于: + 创建于： Version after &update @@ -7727,7 +7729,7 @@ Set a valid executable first. Select &activity: - 选择活动(&A): + 选择活动(&A)： Add @@ -7967,7 +7969,7 @@ Set a valid executable first. Enter &comment: - 输入注释(&comment): + 输入注释(&comment)： ClearCase Add File %1 @@ -8144,7 +8146,7 @@ Set a valid executable first. Enter URL: - 输入URL: + 输入URL： Empty snippet received for "%1". @@ -8216,11 +8218,11 @@ Set a valid executable first. &Path: - 路径(&P): + 路径(&P)： &Display: - 显示(&D): + 显示(&D)： entries @@ -8228,11 +8230,11 @@ Set a valid executable first. Protocol: - 协议: + 协议： Paste: - 粘贴: + 粘贴： Send to Codepaster @@ -8240,7 +8242,7 @@ Set a valid executable first. &Username: - 用户名(&U): + 用户名(&U)： <Username> @@ -8248,7 +8250,7 @@ Set a valid executable first. &Description: - 说明(&D): + 说明(&D)： <Description> @@ -8264,11 +8266,11 @@ Set a valid executable first. Username: - 用户名: + 用户名： Default protocol: - 默认协议: + 默认协议： %1: %2 @@ -8354,7 +8356,7 @@ Set a valid executable first. Additional arguments: - 额外的参数: + 额外的参数： Run conan install @@ -8871,19 +8873,15 @@ Continue? Description: - 说明: - - - Executable: - 执行档: + 说明： Working directory: - 工作目录: + 工作目录： Output: - 输出: + 输出： Ignore @@ -8895,7 +8893,7 @@ Continue? Error output: - 错误输出: + 错误输出： Text to pass to the executable via standard input. Leave empty if the executable should not receive any input. @@ -8903,7 +8901,7 @@ Continue? Input: - 输入: + 输入： If the tool modifies the current document, set this flag to ensure that the document is saved before running the tool and is reloaded after the tool finished. @@ -8990,10 +8988,6 @@ Continue? Base environment: - - Environment: - 环境: - PATH=C:\dev\bin;${PATH} @@ -9031,12 +9025,16 @@ Continue? - Name: - 名称: + Path: + 路径： - Path: - 路径: + Group: + 组： + + + Executable: + 执行档： Unknown @@ -9501,6 +9499,34 @@ To do this, you type this shortcut and a space in the Locator entry field, and t 指定用于限定此目录树的文件的关键词或者缩写。 您可以在“定位器”的输入位置键入这个缩写和一个空格，然后输入搜索的词。 + + Directories: + 目录： + + + Save A&ll + 保存所有文件(&L) + + + <no document> + + + + No document is selected. + + + + Edit + 编辑 + + + Properties... + + + + Pin + + Revert File to Saved 恢复文件到已保存的状态 @@ -9640,7 +9666,7 @@ Do you want to kill it? Filter: - 过滤器: + 过滤器： &Search @@ -9668,7 +9694,7 @@ Do you want to kill it? Sco&pe: - 范围(&P): + 范围(&P)： Shift+Enter @@ -9768,11 +9794,11 @@ Do you want to kill it? Find: - 查找: + 查找： Replace with: - 替换为: + 替换为： <System Language> @@ -9784,11 +9810,11 @@ Do you want to kill it? Color: - 颜色: + 颜色： Language: - 语言: + 语言： Reset to default. @@ -9886,7 +9912,7 @@ Do you want to kill it? Refresh interval: - 更新间隔: + 更新间隔： Locator filters that do not update their cached data immediately, such as the custom directory filters, update it after this time interval. @@ -10204,7 +10230,7 @@ Do you want to kill it? Version: - 版本: + 版本： Change Log @@ -10232,7 +10258,7 @@ Do you want to kill it? Value: - 值: + 值： String @@ -10248,7 +10274,7 @@ Do you want to kill it? Priority: - 优先级: + 优先级： <html><head/><body><p>MIME magic data is interpreted as defined by the Shared MIME-info Database specification from <a href="http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html">freedesktop.org</a>.<hr/></p></body></html> @@ -10296,7 +10322,7 @@ Do you want to kill it? Type: - 类型: + 类型： Mask: @@ -10328,7 +10354,7 @@ Do you want to kill it? Patterns: - 模式: + 模式： Magic Header @@ -10380,7 +10406,7 @@ Do you want to kill it? Choose a template: - 选择一个模板: + 选择一个模板： Projects @@ -10604,7 +10630,7 @@ Do you want to kill it? The following files have unsaved changes: - 以下文件有未保存的修改: + 以下文件有未保存的修改： Automatically save all files before building @@ -10712,7 +10738,7 @@ Do you want to kill it? Key sequence: - 键位顺序: + 键位顺序： Use "Cmd", "Opt", "Ctrl", and "Shift" for modifier keys. Use "Escape", "Backspace", "Delete", "Insert", "Home", and so on, for special keys. Combine individual keys with "+", and combine multiple shortcuts to a shortcut sequence with ",". For example, if the user must hold the Ctrl and Shift modifier keys while pressing Escape, and then release and press A, enter "Ctrl+Shift+Escape,A". @@ -10792,7 +10818,7 @@ Do you want to kill it? Arguments: - 参数: + 参数： Case sensitive: @@ -10899,21 +10925,25 @@ Do you want to kill it? Patch command: + + Environment: + 环境： + Terminal: - 终端: + 终端： External file browser: - 外部文件浏览器: + 外部文件浏览器： When files are externally modified: - 当文件被外部修改时: + 当文件被外部修改时： Interval: - 间隔: + 间隔： Maximum number of entries in "Recent Files": @@ -10972,6 +11002,10 @@ provided they were unmodified before the refactoring. The theme change will take effect after restart. + + Name: + 名称： + Add "%1" placeholder for the query string. Double-click to edit item. @@ -11031,7 +11065,7 @@ Double-click to edit item. Tags: - 标签: + 标签： Switch to <b>%1</b> mode @@ -12158,7 +12192,7 @@ These prefixes are used in addition to current file name on Switch Header/Source C++ Usages: - C++ 使用: + C++ 使用： Searching for Usages @@ -12177,7 +12211,7 @@ These prefixes are used in addition to current file name on Switch Header/Source C++ Macro Usages: - C++ 宏的使用: + C++ 宏的使用： Include Hierarchy @@ -12361,7 +12395,7 @@ These prefixes are used in addition to current file name on Switch Header/Source C++ Symbols: - C++符号: + C++符号： Classes @@ -12393,7 +12427,7 @@ Flags: %3 Types: - 类型: + 类型： Projects only @@ -12907,7 +12941,7 @@ e.g. name = "m_test_foo_": Ignored file patterns: - 被忽略的文件模式: + 被忽略的文件模式： @@ -13208,7 +13242,7 @@ Do you want to display them anyway? Use local core file: - 使用本地核心文件: + 使用本地核心文件： Select Executable @@ -13216,15 +13250,15 @@ Do you want to display them anyway? Kit: - 构建套件(Kit): + 构建套件(Kit)： Core file: - 核心文件: + 核心文件： Override &start script: - 覆盖启动脚本(&S): + 覆盖启动脚本(&S)： Select Remote Core File @@ -13244,15 +13278,15 @@ Do you want to display them anyway? Marker File: - 标记文件: + 标记文件： Marker Line: - 标记行: + 标记行： Breakpoint Address: - 断点地址: + 断点地址： Property @@ -13260,7 +13294,7 @@ Do you want to display them anyway? Breakpoint Type: - 断点类型: + 断点类型： Breakpoint @@ -13276,11 +13310,11 @@ Do you want to display them anyway? File Name: - 文件名: + 文件名： Function Name: - 函数名: + 函数名： Breakpoint on QML Signal Emit @@ -13304,27 +13338,27 @@ Do you want to display them anyway? Line Number: - 行号: + 行号： Module: - 模块: + 模块： Message: - 消息: + 消息： Condition: - 条件: + 条件： Ignore Count: - 忽略次数: + 忽略次数： Thread Specification: - 线程信息: + 线程信息： Function @@ -13743,7 +13777,7 @@ Do you want to display them anyway? GDB timeout: - Gdb超时时间: + Gdb超时时间： sec @@ -13862,19 +13896,19 @@ markers in the source code editor. Address: - 地址: + 地址： Function: - 函数: + 函数： File: - 文件: + 文件： Line: - 行号: + 行号： Note: @@ -13890,27 +13924,27 @@ markers in the source code editor. Thread&nbsp;id: - 线程&nbsp;id: + 线程&nbsp;id： Target&nbsp;id: - 目标&nbsp;id: + 目标&nbsp;id： Name: - 名称: + 名称： State: - 状态: + 状态： Core: - 核心: + 核心： Stopped&nbsp;at: - 停止&nbsp;于: + 停止&nbsp;于： ID @@ -13938,11 +13972,11 @@ markers in the source code editor. Executable: - 执行档: + 执行档： Arguments: - 参数: + 参数： Threads @@ -14081,27 +14115,27 @@ markers in the source code editor. Breakpoint &type: - 断点类型(&T): + 断点类型(&T)： &File name: - 文件名(&F): + 文件名(&F)： &Line number: - 行号(&L): + 行号(&L)： &Enabled: - 启用(&E): + 启用(&E)： &Address: - 地址(&A): + 地址(&A)： Fun&ction: - 函数(&C): + 函数(&C)： Advanced @@ -14109,7 +14143,7 @@ markers in the source code editor. T&racepoint only: - 仅跟踪点(&R): + 仅跟踪点(&R)： &One shot only: @@ -14117,11 +14151,11 @@ markers in the source code editor. Pat&h: - 路径(&H): + 路径(&H)： &Module: - 模块(&M): + 模块(&M)： Use Engine Default @@ -14137,23 +14171,23 @@ markers in the source code editor. &Commands: - 命令(&C): + 命令(&C)： C&ondition: - 条件(&O): + 条件(&O)： &Ignore count: - 忽略次数(&i): + 忽略次数(&i)： &Expression: - 表达式(&E): + 表达式(&E)： &Message: - 消息(&M): + 消息(&M)： Debugger Error @@ -14185,7 +14219,7 @@ markers in the source code editor. Path: - 路径: + 路径： Already Exists @@ -14306,7 +14340,7 @@ Setting breakpoints by file name and line number may fail. Command: - 命令: + 命令： Log File @@ -14326,11 +14360,11 @@ Setting breakpoints by file name and line number may fail. &Condition: - 条件(&C): + 条件(&C)： &Thread specification: - 线程信息(&T): + 线程信息(&T)： Start a CDB Remote Session @@ -14338,7 +14372,7 @@ Setting breakpoints by file name and line number may fail. &Connection: - 连接(&C): + 连接(&C)： Memory... @@ -14625,7 +14659,7 @@ Setting breakpoints by file name and line number may fail. Threads: - 线程: + 线程： Symbol @@ -14681,11 +14715,11 @@ Setting breakpoints by file name and line number may fail. &Source path: - 源路径(&S): + 源路径(&S)： &Target path: - 目标路径(&T): + 目标路径(&T)： Qt Sources @@ -14731,11 +14765,11 @@ Do you want to retry? From: - 从: + 从： To: - 到: + 到： C++ exception @@ -14751,15 +14785,15 @@ Do you want to retry? Load module: - 载入模块: + 载入模块： Unload module: - 卸载模块: + 卸载模块： Output: - 输出: + 输出： Use alternating row colors in debug views @@ -14779,7 +14813,7 @@ Do you want to retry? Maximum stack depth: - 最大堆栈深度: + 最大堆栈深度： <unlimited> @@ -14839,7 +14873,7 @@ Do you want to retry? Server port: - 服务器端口: + 服务器端口： Select Working Directory @@ -14855,39 +14889,39 @@ Do you want to retry? &Kit: - 构建套件(&Kit): + 构建套件(&Kit)： Local &executable: - 本地执行档(&E): + 本地执行档(&E)： Command line &arguments: - 命令行的参数(&A): + 命令行的参数(&A)： &Working directory: - 工作目录(&W): + 工作目录(&W)： Run in &terminal: - 在终端中运行(&T): + 在终端中运行(&T)： Break at "&main": - 在'main'函数断点(&M): + 在'main'函数断点(&M)： Debug &information: - 调试信息(&i): + 调试信息(&i)： &Recent: - 最近历史(&R): + 最近历史(&R)： &Port: - 端口(&P): + 端口(&P)： Start Remote Engine @@ -14895,23 +14929,23 @@ Do you want to retry? &Host: - 主机(&H): + 主机(&H)： &Username: - 用户名(&U): + 用户名(&U)： &Password: - 密码(&P): + 密码(&P)： &Engine path: - 引擎路径(&E): + 引擎路径(&E)： &Inferior path: - 底层(&Inferior)路径: + 底层(&Inferior)路径： Reset @@ -15299,7 +15333,7 @@ Stepping into the module or setting breakpoints by file and line will not work.< Change Display for Object Named "%1": - 为名为"%1"的对象改变显示: + 为名为"%1"的对象改变显示： Use Format for Type (Currently %1) @@ -15307,7 +15341,7 @@ Stepping into the module or setting breakpoints by file and line will not work.< Change Display for Type "%1": - 为类型"%1"改变显示: + 为类型"%1"改变显示： Automatic @@ -15428,7 +15462,7 @@ Stepping into the module or setting breakpoints by file and line will not work.< Working directory: - 工作目录: + 工作目录： File Name and Line Number @@ -15673,7 +15707,7 @@ Install the "Qt Debug Information Files" Package from the Maintenance Additional arguments: - 额外的参数: + 额外的参数： Catches runtime error messages caused by assert(), for example. @@ -16186,7 +16220,7 @@ Examining symbols and setting breakpoints by file name and line number may fail. Type: - 类型: + 类型： ABIs: @@ -16194,7 +16228,7 @@ Examining symbols and setting breakpoints by file name and line number may fail. Version: - 版本: + 版本： Specify the path to the <a href="%1">Windows Console Debugger executable</a> (%2) here. @@ -17727,23 +17761,23 @@ Rebuilding the project might help. &Class name: - 类名(&C): + 类名(&C)： &Header file: - 头文件(&H): + 头文件(&H)： &Source file: - 源文件(&S): + 源文件(&S)： &Form file: - 界面文件(&F): + 界面文件(&F)： &Path: - 路径(&P): + 路径(&P)： Invalid header file name: "%1" @@ -18084,7 +18118,7 @@ Rebuilding the project might help. Repository: - 代码仓库: + 代码仓库： Tag: @@ -18200,7 +18234,7 @@ Rebuilding the project might help. Command: - 命令: + 命令： Configuration @@ -18399,14 +18433,6 @@ Rebuilding the project might help. Environment 环境 - - Add... - 添加... - - - Remove - 删除 - Edit... 编辑... @@ -18420,47 +18446,47 @@ Rebuilding the project might help. QtC::ExtensionSystem Name: - 名称: + 名称： Version: - 版本: + 版本： Vendor: - 销售商: + 销售商： Location: - 位置: + 位置： Description: - 说明: + 说明： Copyright: - 版权: + 版权： License: - 许可: + 许可： Dependencies: - 依赖关系: + 依赖关系： Group: - 组: + 组： Compatibility version: - 兼容版本: + 兼容版本： URL: - URL: + URL： Platforms: @@ -18468,11 +18494,11 @@ Rebuilding the project might help. The following plugins have errors and cannot be loaded: - 以下插件有错误，无法被载入: + 以下插件有错误，无法被载入： Details: - 详情: + 详情： Plugin Loader Messages @@ -18480,11 +18506,11 @@ Rebuilding the project might help. State: - 状态: + 状态： Error message: - 错误信息: + 错误信息： %1 > About Plugins @@ -18756,7 +18782,7 @@ will also disable the following plugins: Tabulator size: - 制表符大小: + 制表符大小： Smart tabulators @@ -18768,7 +18794,7 @@ will also disable the following plugins: Shift width: - 缩进宽度: + 缩进宽度： Expand tabulators @@ -18824,11 +18850,11 @@ will also disable the following plugins: Backspace: - 退格: + 退格： Keyword characters: - 关键词字符: + 关键词字符： Use Vim-style Editing @@ -19054,7 +19080,7 @@ will also disable the following plugins: Regular expression: - 正则表达式: + 正则表达式： Action @@ -19255,11 +19281,11 @@ Use drag and drop to change the order of the parameters. Project name: - 项目名称: + 项目名称： Location: - 位置: + 位置： File Selection @@ -19322,7 +19348,7 @@ Partially checked - Do not change current state. To: - 到: + 到： Number of commits @@ -19378,11 +19404,11 @@ Partial names can be used if they are unambiguous. Working directory: - 工作目录: + 工作目录： Change: - 更改: + 更改： Invalid revision @@ -19390,7 +19416,7 @@ Partial names can be used if they are unambiguous. Description: - 说明: + 说明： Stash Description @@ -19695,7 +19721,7 @@ Partial names can be used if they are unambiguous. Repository: - 代码仓库: + 代码仓库： repository @@ -19711,11 +19737,11 @@ Partial names can be used if they are unambiguous. Author: - 作者: + 作者： Email: - Email: + Email： By&pass hooks @@ -19751,7 +19777,7 @@ Partial names can be used if they are unambiguous. Arguments: - 参数: + 参数： Configuration @@ -19759,11 +19785,11 @@ Partial names can be used if they are unambiguous. Prepend to PATH: - 附加在系统PATH之前: + 附加在系统PATH之前： Command: - 命令: + 命令： Stashes @@ -19827,7 +19853,7 @@ You can choose between stashing the changes or discarding them. Branch: - Branch: + Branch： Stash Restore @@ -19875,15 +19901,15 @@ You can choose between stashing the changes or discarding them. Branch Name: - 分支名称: + 分支名称： Name: - 名称: + 名称： URL: - URL: + URL： Remotes @@ -19939,7 +19965,7 @@ You can choose between stashing the changes or discarding them. &Query: - 查询(&Query): + 查询(&Query)： Change #, SHA-1, tr:id, owner:email or reviewer:email @@ -19991,19 +20017,19 @@ You can choose between stashing the changes or discarding them. &Host: - 主机(&H): + 主机(&H)： &User: - 用户(&U): + 用户(&U)： &ssh: - &ssh: + &ssh： P&rotocol: - 协议(&R): + 协议(&R)： Determines the protocol used to form a URL in case @@ -20034,7 +20060,7 @@ You can choose between stashing the changes or discarding them. Reset to: - 重置为: + 重置为： Undo Changes to %1 @@ -20300,11 +20326,11 @@ You can choose between stashing the changes or discarding them. Server: - 服务器: + 服务器： &Password: - 密码(&P): + 密码(&P)： Anonymous @@ -20909,7 +20935,7 @@ Would you like to create the branch "%1" on the remote and set it as u Filter: - 过滤器: + 过滤器： Case Sensitive @@ -21515,11 +21541,11 @@ Note: This can expose you to man-in-the-middle attack. Host: - 主机: + 主机： Description: - 说明: + 说明： Access token: @@ -21527,7 +21553,7 @@ Note: This can expose you to man-in-the-middle attack. Port: - 端口: + 端口： HTTPS: @@ -21535,7 +21561,7 @@ Note: This can expose you to man-in-the-middle attack. Default: - 默认: + 默认： curl: @@ -21699,11 +21725,11 @@ Note: This can expose you to man-in-the-middle attack. Invalid documentation file: - 无效的文档文件: + 无效的文档文件： Namespace already registered: - 命名空间已经注册: + 命名空间已经注册： Unable to register documentation. @@ -21879,15 +21905,15 @@ Note: This can expose you to man-in-the-middle attack. Family: - 字型: + 字型： Style: - 风格: + 风格： Size: - 字号: + 字号： Startup @@ -21895,7 +21921,7 @@ Note: This can expose you to man-in-the-middle attack. On context help: - 上下文相关帮助: + 上下文相关帮助： Show Side-by-Side if Possible @@ -21907,7 +21933,7 @@ Note: This can expose you to man-in-the-middle attack. On help start: - 帮助开始时: + 帮助开始时： Show My Home Page @@ -21923,7 +21949,7 @@ Note: This can expose you to man-in-the-middle attack. Home page: - 主页: + 主页： Use &Current Page @@ -21987,7 +22013,7 @@ Note: This can expose you to man-in-the-middle attack. Zoom: - 缩放: + 缩放： % @@ -22176,7 +22202,7 @@ Note: This can expose you to man-in-the-middle attack. &Look for: - 查找(&L): + 查找(&L)： @@ -22430,7 +22456,7 @@ Note: This can expose you to man-in-the-middle attack. File: - 文件: + 文件： x @@ -22769,7 +22795,7 @@ Would you like to overwrite them? Make arguments: - Make 参数: + Make 参数： IncrediBuild for Linux @@ -22831,7 +22857,7 @@ Id必须以小写字母开头。 Device type: - 设备类型: + 设备类型： OS version: @@ -22973,11 +22999,11 @@ Id必须以小写字母开头。 Command: - 命令: + 命令： Arguments: - 参数: + 参数： Reset to Default @@ -23470,11 +23496,11 @@ Error: %5 Name: - 名称: + 名称： Language: - 语言: + 语言： Set MIME Types... @@ -23626,11 +23652,11 @@ Error: %5 Executable: - 执行档: + 执行档： Arguments: - 参数: + 参数： &Add @@ -23777,7 +23803,7 @@ Error: %5 QtC::LanguageClient Capabilities: - 能力: + 能力： Dynamic Capabilities: @@ -23785,7 +23811,7 @@ Error: %5 Method: - 方法: + 方法： Options: @@ -23860,7 +23886,7 @@ Error: %5 Description: - 说明: + 说明： Description) @@ -23916,7 +23942,7 @@ Error: %5 Name: - 名称: + 名称： @@ -24267,11 +24293,11 @@ Error: %5 Repository: - 代码仓库: + 代码仓库： Branch: - 分支: + 分支： Commit Information @@ -24279,11 +24305,11 @@ Error: %5 Author: - 作者: + 作者： Email: - 电子邮件: + 电子邮件： Configuration @@ -24291,7 +24317,7 @@ Error: %5 Command: - 命令: + 命令： User @@ -24303,7 +24329,7 @@ Error: %5 Default username: - 默认用户名: + 默认用户名： Email to use by default on commit. @@ -24319,7 +24345,7 @@ Error: %5 Default email: - 默认电子邮件: + 默认电子邮件： Revert @@ -24331,11 +24357,11 @@ Error: %5 Revision: - 修订版本: + 修订版本： Local filesystem: - 本地文件系统: + 本地文件系统： Default Location @@ -24343,7 +24369,7 @@ Error: %5 Specify URL: - 指定URL: + 指定URL： Commit Editor @@ -24520,11 +24546,11 @@ Error: %5 Username: - 用户名: + 用户名： Password: - 密码: + 密码： Mercurial Diff @@ -24677,7 +24703,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Targets: - 目标: + 目标： Meson Build @@ -24721,11 +24747,11 @@ Useful if build directory is corrupted or when rebuilding with a newer version o Name: - 名称: + 名称： Path: - 路径: + 路径： Name @@ -25158,7 +25184,7 @@ Error: Target: - 目标: + 目标： Default arguments: @@ -25170,7 +25196,7 @@ Error: Command: - 命令: + 命令： Nim Compiler Build Step @@ -25178,7 +25204,7 @@ Error: Working directory: - 工作目录: + 工作目录： Build directory "%1" does not exist. @@ -25214,7 +25240,7 @@ Error: &Compiler path: - 编译器路径(&C): + 编译器路径(&C)： &Compiler version: @@ -25226,7 +25252,7 @@ Error: Path: - 路径: + 路径： Global @@ -25828,7 +25854,7 @@ You might find further explanations in the Application Output view. Additional arguments: - 额外的参数: + 额外的参数： sample collected @@ -25949,7 +25975,7 @@ You might find further explanations in the Application Output view. Change Number: - Change编号: + Change编号： P4 Pending Changes @@ -26362,7 +26388,7 @@ You might find further explanations in the Application Output view. Timeout: - 超时时间: + 超时时间： s @@ -26370,23 +26396,23 @@ You might find further explanations in the Application Output view. Log count: - 日志数: + 日志数： P4 command: - P4 命令: + P4 命令： P4 client: - P4 客户端: + P4 客户端： P4 user: - P4 用户: + P4 用户： P4 port: - P4 端口: + P4 端口： Environment Variables @@ -26410,15 +26436,15 @@ You might find further explanations in the Application Output view. Change: - 更改: + 更改： Client: - 客户端: + 客户端： User: - 用户: + 用户： @@ -26745,11 +26771,11 @@ The name of the build configuration created by default for a generic project. Build directory: - 构建目录: + 构建目录： Shadow build: - Shadow build: + Shadow build： Finished %1 of %n steps @@ -26841,7 +26867,7 @@ The name of the build configuration created by default for a generic project. Kit: - 构建套件(Kit): + 构建套件(Kit)： List of Processes @@ -26861,7 +26887,7 @@ The name of the build configuration created by default for a generic project. &Filter: - 过滤器(&F): + 过滤器(&F)： &Attach to Process @@ -26907,7 +26933,7 @@ The name of the build configuration created by default for a generic project. Base environment for this run configuration: - 运行设置的基础环境: + 运行设置的基础环境： Change... @@ -26969,11 +26995,11 @@ The name of the build configuration created by default for a generic project. Executable: - 执行档: + 执行档： Alternate executable on device: - 设备上的备用执行档: + 设备上的备用执行档： Use this command instead @@ -27005,7 +27031,7 @@ The name of the build configuration created by default for a generic project. All Projects: - 所有项目: + 所有项目： Attach debugger to this process @@ -27137,7 +27163,7 @@ The name of the build configuration created by default for a generic project. Edit build configuration: - 编辑构建配置: + 编辑构建配置： Rename... @@ -27145,7 +27171,7 @@ The name of the build configuration created by default for a generic project. New name for build configuration <b>%1</b>: - 构建配置的新名称 <b>%1</b>: + 构建配置的新名称 <b>%1</b>： Clone Configuration @@ -27230,9 +27256,13 @@ The name of the build configuration created by default for a generic project.No Build Steps 没有构建步骤 + + Enable + + Language: - 语言: + 语言： Compile Output @@ -27278,15 +27308,15 @@ The name of the build configuration created by default for a generic project. &File name: - 文件名(&F): + 文件名(&F)： &Line number: - 行号(&L): + 行号(&L)： &Message: - 消息(&M): + 消息(&M)： Standard output @@ -27322,15 +27352,15 @@ The name of the build configuration created by default for a generic project. File name: - 文件名: + 文件名： Line number: - 行号: + 行号： Message: - 消息: + 消息： Error @@ -27340,9 +27370,107 @@ The name of the build configuration created by default for a generic project.Warning 警告 + + Not applicable: + + + + Pattern is empty. + + + + No message given. + + + + Pattern does not match the message. + + + + Parse standard output during build + + + + Makes output parsers look for diagnostics on stdout rather than stderr. + + + + There are no custom parsers active + + + + There are %n custom parsers active + + + + + + Custom output parsers defined here can be enabled individually in the project's build or run settings. + + + + Add... + 添加... + + + Remove + 删除 + + + New Parser + + + + Custom Output Parsers + + + + MACRO[=VALUE] + + + + Each line defines a macro. Format is MACRO[=VALUE]. + + + + Each line adds a global header lookup path. + + + + Comma-separated list of flags that turn on C++11 support. + + + + Comma-separated list of mkspecs. + + + + &Make path: + + + + &Predefined macros: + + + + &Header paths: + + + + C++11 &flags: + + + + &Qt mkspecs: + + + + &Error parser: + + Path: - 路径: + 路径： <No other projects in this session> @@ -27354,7 +27482,7 @@ The name of the build configuration created by default for a generic project. Files to deploy: - 部署文件: + 部署文件： Override deployment data from build system @@ -27366,7 +27494,7 @@ The name of the build configuration created by default for a generic project. Available device types: - 可用的设备类型: + 可用的设备类型： Start Wizard @@ -27378,7 +27506,7 @@ The name of the build configuration created by default for a generic project. &Device: - 设备(&D): + 设备(&D)： General @@ -27386,19 +27514,19 @@ The name of the build configuration created by default for a generic project. &Name: - 名称(&N): + 名称(&N)： Type: - 类型: + 类型： Auto-detected: - 自动检测: + 自动检测： Current state: - 当前状态: + 当前状态： Type Specific @@ -27454,7 +27582,7 @@ The name of the build configuration created by default for a generic project. Display right &margin at column: - 显示右边分界(&M)在列: + 显示右边分界(&M)在列： Use context-specific margin @@ -27564,11 +27692,7 @@ What should %1 do now? &Compiler path: - 编译器路径(&C): - - - &ABI: - &ABI: + 编译器路径(&C)： Platform codegen flags: @@ -27606,10 +27730,6 @@ What should %1 do now? No 'key' in options object. - - Name: - 名称: - Kit name and icon. 套件的名称和图标。 @@ -27730,7 +27850,7 @@ What should %1 do now? Initialization: - 初始化: + 初始化： <empty> @@ -27740,6 +27860,10 @@ What should %1 do now? Additional arguments for the vcvarsall.bat call + + &ABI: + &ABI： + Parse Build Output @@ -27978,15 +28102,15 @@ to project "%2". Add as a subproject to project: - 作为子项目添加到项目中: + 作为子项目添加到项目中： Add to &project: - 添加到项目(&P): + 添加到项目(&P)： Files to be added: - 要添加的文件: + 要添加的文件： Files to be added in @@ -27994,7 +28118,7 @@ to project "%2". Add to &version control: - 添加到版本控制系统(&V): + 添加到版本控制系统(&V)： <None> @@ -28019,7 +28143,7 @@ to project "%2". Run configuration: - 运行配置: + 运行配置： Deployment @@ -28027,7 +28151,7 @@ to project "%2". Method: - 方法: + 方法： Remove Run Configuration? @@ -28039,7 +28163,7 @@ to project "%2". New name for run configuration <b>%1</b>: - 运行配置的新名称 <b>%1</b>: + 运行配置的新名称 <b>%1</b>： Cancel Build && Remove Deploy Configuration @@ -28067,11 +28191,11 @@ to project "%2". New name for deploy configuration <b>%1</b>: - 部署配置的新名称 <b>%1</b>: + 部署配置的新名称 <b>%1</b>： New configuration name: - 新配置名称: + 新配置名称： Custom output parsers scan command line output for user-provided error patterns<br>to create entries in Issues.<br>The parsers can be configured <a href="dummy">here</a>. @@ -28147,7 +28271,7 @@ to project "%2". Enter the name of the session: - 输入会话的名称: + 输入会话的名称： Show task location in an editor. @@ -28179,7 +28303,7 @@ to project "%2". Project name: - 项目名称: + 项目名称： Location: @@ -28810,11 +28934,11 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated Error: - 错误: + 错误： Warning: - 警告: + 警告： Kit @@ -28874,7 +28998,7 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated Make arguments: - Make 参数: + Make 参数： Parallel jobs: @@ -28898,15 +29022,15 @@ Enable this if you plan to create 32-bit x86 binaries without using a dedicated Targets: - 目标: + 目标： Make: - Make: + Make： Override %1: - 覆盖 %1: + 覆盖 %1： Make @@ -28949,15 +29073,11 @@ Please close all running instances of your application before starting a build.< Command: - 命令: + 命令： Arguments: - 参数: - - - Working directory: - 工作目录: + 参数： Custom Process Step @@ -29860,7 +29980,7 @@ Rename %2 to %3 anyway? Hide files matching: - 隐藏符合条件的文件: + 隐藏符合条件的文件： Apply Filters @@ -30052,6 +30172,10 @@ These files are preserved. Run in terminal 在终端中运行 + + Name: + 名称： + <No compiler> @@ -30120,6 +30244,10 @@ These files are preserved. Select Working Directory 选择工作目录 + + Working directory: + 工作目录： + Replacing signature @@ -30441,7 +30569,7 @@ Expiration date: %3 Name: - 名称: + 名称： Executable @@ -30799,7 +30927,7 @@ Are you sure? Configuration name: - 配置名称: + 配置名称： The qbs project build root @@ -31272,7 +31400,7 @@ The affected files are: Executable on device: - 设备上的执行档: + 设备上的执行档： Remote path not set @@ -31280,7 +31408,7 @@ The affected files are: Executable on host: - 主机上的执行档: + 主机上的执行档： Run on Boot2Qt Device @@ -31367,11 +31495,11 @@ The affected files are: Error: - 错误: + 错误： Warning: - 警告: + 警告： Run qmake @@ -31456,39 +31584,39 @@ The affected files are: Widget librar&y: - 控件库(&Y): + 控件库(&Y)： Widget project &file: - 控件项目文件(&F): + 控件项目文件(&F)： Widget h&eader file: - 控件头文件(&E): + 控件头文件(&E)： Widge&t source file: - 控件源文件(&T): + 控件源文件(&T)： Widget &base class: - 控件的基类(&B): + 控件的基类(&B)： Plugin class &name: - 插件类名(&N): + 插件类名(&N)： Plugin &header file: - 插件头文件(&H): + 插件头文件(&H)： Plugin sou&rce file: - 插件源文件(&R): + 插件源文件(&R)： Icon file: - 图标文件: + 图标文件： &Link library @@ -31508,15 +31636,15 @@ The affected files are: G&roup: - 组(&R): + 组(&R)： &Tooltip: - 工具提示(&T): + 工具提示(&T)： W&hat's this: - 这是什么(&H): + 这是什么(&H)： The widget is a &container @@ -31528,7 +31656,7 @@ The affected files are: dom&XML: - dom &XML: + dom &XML： Select Icon @@ -31544,23 +31672,23 @@ The affected files are: Collection class: - 集合类: + 集合类： Collection header file: - 集合类头文件: + 集合类头文件： Collection source file: - 集合类源文件: + 集合类源文件： Plugin name: - 插件名称: + 插件名称： Resource file: - 资源文件: + 资源文件： icons.qrc @@ -31568,7 +31696,7 @@ The affected files are: Widget &Classes: - 控件类(&C): + 控件类(&C)： Specify the list of custom widgets and their properties. @@ -31621,15 +31749,15 @@ The affected files are: Library: - 库: + 库： Library file: - 库文件: + 库文件： Include path: - 包含路径: + 包含路径： Linux @@ -31645,7 +31773,7 @@ The affected files are: Linkage: - 链接: + 链接： Dynamic @@ -31657,7 +31785,7 @@ The affected files are: Mac: - Mac: + Mac： Library @@ -31669,7 +31797,7 @@ The affected files are: Windows: - Windows: + Windows： Library inside "debug" or "release" subfolder @@ -31685,7 +31813,7 @@ The affected files are: Package: - 包: + 包： Add Library @@ -31852,15 +31980,15 @@ Adds the library and include paths to the .pro file. qmake build configuration: - qmake 构建配置: + qmake 构建配置： Additional arguments: - 额外的参数: + 额外的参数： Effective qmake call: - 有效的qmake调用: + 有效的qmake调用： The mkspec to use when building the project with qmake.<br>This setting is ignored when using other build systems. @@ -32650,11 +32778,11 @@ The new project can be opened in Qt Creator using the main CMakeLists.txt file.< Name: - 名称: + 名称： Create in: - 创建路径: + 创建路径： Name is empty. @@ -33669,7 +33797,7 @@ The following files or directories are missing: Path: - 路径: + 路径： Path to the QML emulation layer executable (qmlpuppet). @@ -34028,7 +34156,7 @@ The following files or directories are missing: Property name: - 属性名称: + 属性名称： Change Property @@ -34832,7 +34960,7 @@ Locked components cannot be modified or selected. Duration: - 持续时间: + 持续时间： Last frame of the animation. @@ -35812,7 +35940,7 @@ Error: %2 Errors while reading typeinfo files: - 读取typeinfo文件发生错误: + 读取typeinfo文件发生错误： Could not locate the helper application for dumping type information from C++ plugins. @@ -36382,15 +36510,15 @@ For more information, see the "Checking Code Syntax" documentation. Path: - 路径: + 路径： Component name: - 组件名: + 组件名： QML/JS Usages: - QML/JS 使用: + QML/JS 使用： Show All Bindings @@ -36737,7 +36865,7 @@ the QML editor know about a likely URI. &Port: - 端口(&P): + 端口(&P)： QML Profiler Options @@ -37660,7 +37788,7 @@ Qt Design Studio requires a .qmlproject based project to open the .ui.qml file.< Qt Version: - Qt 版本: + Qt 版本： Qt 6 @@ -37732,7 +37860,7 @@ Qt Design Studio requires a .qmlproject based project to open the .ui.qml file.< Local executable: - 本地执行档: + 本地执行档： Remote QNX process %1 @@ -37831,7 +37959,7 @@ Are you sure you want to continue? Executable on device: - 设备上的执行档: + 设备上的执行档： Remote path not set @@ -37839,7 +37967,7 @@ Are you sure you want to continue? Executable on host: - 主机上的执行档: + 主机上的执行档： Path to Qt libraries on device @@ -37863,19 +37991,19 @@ Are you sure you want to continue? Name: - 名称: + 名称： Version: - 版本: + 版本： Host: - 主机: + 主机： Target: - 目标: + 目标： Select QNX Environment File @@ -37902,10 +38030,6 @@ Are you sure you want to continue? QCC - - &Compiler path: - 编译器路径(&C): - SDP path: SDP refers to 'Software Development Platform'. @@ -37913,7 +38037,7 @@ Are you sure you want to continue? &ABI: - &ABI: + &ABI： Warning: "slog2info" is not found on the device, debug output not available. @@ -38092,7 +38216,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf &Location: - 路径(&L): + 路径(&L)： &Copy Project and Open @@ -38152,7 +38276,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Name: - 名称: + 名称： Invalid Qt version @@ -38160,27 +38284,27 @@ For more details, see /etc/sysctl.d/10-ptrace.conf ABI: - ABI: + ABI： Source: - 源: + 源： mkspec: - mkspec: + mkspec： qmake: - qmake: + qmake： Default: - 默认: + 默认： Version: - 版本: + 版本： The version string of the current Qt version. @@ -38548,7 +38672,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf Language: - 语言: + 语言： Translation file: @@ -38678,11 +38802,11 @@ In addition, device connectivity will be tested. Executable on host: - 主机上的执行档: + 主机上的执行档： Executable on device: - 设备上的执行档: + 设备上的执行档： Clean Environment @@ -38710,7 +38834,7 @@ In addition, device connectivity will be tested. Create tarball: - 创建tarball: + 创建tarball： No deployment action necessary. Skipping. @@ -38754,7 +38878,7 @@ In addition, device connectivity will be tested. Command line: - 命令行: + 命令行： Checking if specified ports are available... @@ -38818,11 +38942,11 @@ In addition, device connectivity will be tested. Authentication type: - 验证类型: + 验证类型： &Host name: - 主机名称(&H): + 主机名称(&H)： IP or host name of the device @@ -38830,15 +38954,15 @@ In addition, device connectivity will be tested. &SSH port: - SSH端口(&S): + SSH端口(&S)： Free ports: - 空闲端口: + 空闲端口： Timeout: - 超时时间: + 超时时间： s @@ -38846,11 +38970,11 @@ In addition, device connectivity will be tested. &Username: - 用户名(&U): + 用户名(&U)： Private key file: - 私钥文件: + 私钥文件： Create New... @@ -38858,7 +38982,7 @@ In addition, device connectivity will be tested. Machine type: - 机器类型: + 机器类型： Physical Device @@ -38878,11 +39002,11 @@ In addition, device connectivity will be tested. The name to identify this configuration: - 标识配置的名称: + 标识配置的名称： The device's host name or IP address: - 设备的域名或者IP地址: + 设备的域名或者IP地址： Deploy Public Key... @@ -39169,7 +39293,7 @@ Control process failed to start. Command: - 命令: + 命令： Install root: @@ -39225,7 +39349,7 @@ Control process failed to start. Local executable: - 本地执行档: + 本地执行档： Custom Executable @@ -39330,15 +39454,15 @@ Control process failed to start. Key algorithm: - 密钥算法: + 密钥算法： Key &size: - 密钥长度(&S): + 密钥长度(&S)： Public key file: - 公钥文件: + 公钥文件： The ssh-keygen tool was not found. @@ -39526,7 +39650,7 @@ Control process failed to start. Alias: - 别名: + 别名： Prefix: @@ -39534,7 +39658,7 @@ Control process failed to start. Language: - 语言: + 语言： Properties @@ -40724,7 +40848,7 @@ Row: %4, Column: %5 Arguments: - 参数: + 参数： Recording Settings @@ -41053,15 +41177,15 @@ Refusing to record test case "%2". Name: - 名称: + 名称： Host: - 主机: + 主机： Port: - 端口: + 端口： Add Attachable AUT @@ -41620,7 +41744,7 @@ Failed to open file "%1" Revision number: - 修订版本编号: + 修订版本编号： Triggers a Subversion version control operation. @@ -41636,15 +41760,15 @@ Failed to open file "%1" Subversion command: - Subversion 命令: + Subversion 命令： Username: - 用户名: + 用户名： Password: - 密码: + 密码： Ignore whitespace changes in annotation @@ -41656,7 +41780,7 @@ Failed to open file "%1" Timeout: - 超时时间: + 超时时间： s @@ -42117,7 +42241,7 @@ Failed to open file "%1" Backspace indentation: - 退格缩进: + 退格缩进： <html><head/><body> @@ -42159,7 +42283,7 @@ Specifies how backspace interacts with indentation. Tab key performs auto-indent: - 制表符(Tab键)提供自动缩进: + 制表符(Tab键)提供自动缩进： Never @@ -42203,7 +42327,7 @@ Specifies how backspace interacts with indentation. Default encoding: - 默认编码: + 默认编码： Add If Encoding Is UTF-8 @@ -42219,7 +42343,7 @@ Specifies how backspace interacts with indentation. UTF-8 BOM: - UTF-8 BOM: + UTF-8 BOM： Mouse and Keyboard @@ -42341,7 +42465,7 @@ Specifies how backspace interacts with indentation. Current settings: - 当前设置: + 当前设置： Copy Code Style @@ -42349,7 +42473,7 @@ Specifies how backspace interacts with indentation. Code style name: - 代码风格名称: + 代码风格名称： %1 (Copy) @@ -42417,7 +42541,7 @@ Specifies how backspace interacts with indentation. Display right &margin at column: - 显示右边分界(&M)在列: + 显示右边分界(&M)在列： Highlight &blocks @@ -42517,7 +42641,7 @@ Specifies how backspace interacts with indentation. Director&y: - 目录(&Y): + 目录(&Y)： Files in File System @@ -42545,11 +42669,11 @@ Excluding: %3 Family: - 字型: + 字型： Size: - 字号: + 字号： Antialias @@ -42565,7 +42689,7 @@ Excluding: %3 Zoom: - 缩放: + 缩放： A line spacing value other than 100% disables text wrapping. @@ -42594,7 +42718,7 @@ A value less than 100% can result in overlapping and misaligned graphics. Color scheme name: - 配色方案名称: + 配色方案名称： %1 (copy) @@ -42666,11 +42790,11 @@ A value less than 100% can result in overlapping and misaligned graphics. Background: - 背景颜色: + 背景颜色： Foreground: - 前景颜色: + 前景颜色： Unset @@ -42714,7 +42838,7 @@ A value less than 100% can result in overlapping and misaligned graphics. Color: - 颜色: + 颜色： No Underline @@ -42758,7 +42882,7 @@ A value less than 100% can result in overlapping and misaligned graphics. &Case-sensitivity: - 大小写敏感(&C): + 大小写敏感(&C)： Manually @@ -42774,7 +42898,7 @@ A value less than 100% can result in overlapping and misaligned graphics. Activate completion: - 激活补全: + 激活补全： Timeout in ms: @@ -42922,7 +43046,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Open documents: - 打开文档: + 打开文档： Open Documents @@ -42936,7 +43060,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Ignored file patterns: - 被忽略的文件模式: + 被忽略的文件模式： <html><head/><body><p>Highlight definitions are provided by the <a href="https://api.kde.org/frameworks/syntax-highlighting/html/index.html">KSyntaxHighlighting</a> engine.</p></body></html> @@ -43049,7 +43173,7 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Group: - 组: + 组： Error While Saving Snippet Collection @@ -43694,15 +43818,15 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Ta&b size: - 制表符尺寸(&B): + 制表符尺寸(&B)： &Indent size: - 缩进尺寸(&i): + 缩进尺寸(&i)： Align continuation lines: - 对齐连续行: + 对齐连续行： <html><head/><body> @@ -43770,7 +43894,7 @@ Influences the indentation of continuation lines. Tab policy: - 缩进策略: + 缩进策略： Spaces Only @@ -44767,7 +44891,7 @@ Will not be applied to whitespace in comments and strings. QtC::Help Choose a topic for <b>%1</b>: - 为<b>%1</b>选择一个标题: + 为<b>%1</b>选择一个标题： Choose Topic @@ -45147,11 +45271,11 @@ To disable a variable, prefix the line with "#". File extension %1 is required: - 需要文件扩展 %1 : + 需要文件扩展 %1 ： File extensions %1 are required: - 需要文件扩展 %1 : + 需要文件扩展 %1 ： Invalid character "%1". @@ -45179,7 +45303,7 @@ To disable a variable, prefix the line with "#". Fi&le pattern: - 文件模式(&L): + 文件模式(&L)： Excl&usion pattern: @@ -45307,7 +45431,7 @@ To disable a variable, prefix the line with "#". File name: - 文件名: + 文件名： Location @@ -45461,7 +45585,7 @@ To disable a variable, prefix the line with "#". Path: - 路径: + 路径： The path "%1" expanded to an empty string. @@ -45521,11 +45645,11 @@ To disable a variable, prefix the line with "#". Name: - 名称: + 名称： Create in: - 创建路径: + 创建路径： Use as default project location @@ -45561,7 +45685,7 @@ To disable a variable, prefix the line with "#". Username: - 用户名: + 用户名： Username @@ -45569,7 +45693,7 @@ To disable a variable, prefix the line with "#". Password: - 密码: + 密码： Password @@ -45781,7 +45905,7 @@ To disable a variable, prefix the line with "#". New name for configuration <b>%1</b>: - 配置的新名称 <b>%1</b>: + 配置的新名称 <b>%1</b>： Rename... @@ -46024,19 +46148,19 @@ To disable a variable, prefix the line with "#". QtC::Valgrind Function: - 函数: + 函数： Location: - 位置: + 位置： Instruction pointer: - 指令指针: + 指令指针： Object: - 对象: + 对象： Could not parse hex number from "%1" (%2) @@ -46116,11 +46240,11 @@ To disable a variable, prefix the line with "#". Suppression File: - Suppression 文件: + Suppression 文件： Suppression: - Suppression: + Suppression： Select Suppression File @@ -46132,7 +46256,7 @@ To disable a variable, prefix the line with "#". Valgrind executable: - Valgrind 执行档: + Valgrind 执行档： Valgrind Command @@ -46148,11 +46272,11 @@ To disable a variable, prefix the line with "#". Backtrace frame count: - 回溯(backtrace)帧数: + 回溯(backtrace)帧数： Suppression files: - Suppression 文件: + Suppression 文件： Add... @@ -46172,7 +46296,7 @@ To disable a variable, prefix the line with "#". Result view: Minimum event cost: - 结果视图: 最小事件花费: + 结果视图: 最小事件花费： % @@ -46204,7 +46328,7 @@ To disable a variable, prefix the line with "#". Visualization: Minimum event cost: - 可视化: 最小事件花费: + 可视化: 最小事件花费： Profiling @@ -46429,11 +46553,11 @@ To disable a variable, prefix the line with "#". File: - 文件: + 文件： Called: - 被调用: + 被调用： %n time(s) @@ -46543,11 +46667,11 @@ To disable a variable, prefix the line with "#". Line: - 行号: + 行号： Position: - 位置: + 位置： Parsing Profile Data... @@ -46897,7 +47021,7 @@ With cache simulation, further event counters are enabled: There were errors when cleaning the repository %1: - 清理代码仓库%1时发生错误: + 清理代码仓库%1时发生错误： Delete... @@ -46933,7 +47057,7 @@ With cache simulation, further event counters are enabled: User/&alias configuration file: - 用户/别名配置文件(&A): + 用户/别名配置文件(&A)： A file listing nicknames in a 4-column mailmap format: @@ -46942,7 +47066,7 @@ With cache simulation, further event counters are enabled: User &fields configuration file: - 用户字段配置文件(&F): + 用户字段配置文件(&F)： A simple file containing lines with field names like "Reviewed-By:" which will be added below the submit editor. @@ -46950,7 +47074,7 @@ With cache simulation, further event counters are enabled: Submit message &check script: - 提交信息检查脚本(&C): + 提交信息检查脚本(&C)： An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure. @@ -46958,7 +47082,7 @@ With cache simulation, further event counters are enabled: &SSH prompt command: - SSH 提示命令(&S): + SSH 提示命令(&S)： Specifies a command that is executed to graphically prompt for a password, @@ -46967,7 +47091,7 @@ should a repository require SSH-authentication (see documentation on SSH and the Wrap submit message at: - 提交信息折行在: + 提交信息折行在： characters @@ -47242,7 +47366,7 @@ should a repository require SSH-authentication (see documentation on SSH and the Timeout: - 超时时间: + 超时时间： s @@ -48012,7 +48136,7 @@ What do you want to do? Name: - 名称: + 名称： Children: @@ -48172,7 +48296,7 @@ What do you want to do? Color: - 颜色: + 颜色： Normal diff --git a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp index 63810fa6e9a..e8ff40b3105 100644 --- a/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeconfigitem.cpp @@ -194,7 +194,17 @@ QString CMakeConfigItem::expandedValue(const ProjectExplorer::Kit *k) const QString CMakeConfigItem::expandedValue(const Utils::MacroExpander *expander) const { - return expander ? expander->expand(QString::fromUtf8(value)) : QString::fromUtf8(value); + QString expandedValue = expander ? expander->expand(QString::fromUtf8(value)) + : QString::fromUtf8(value); + + // Make sure we have CMake paths using / instead of \\ on Windows + // %{buildDir} returns \\ on Windows + if (type == CMakeConfigItem::FILEPATH || type == CMakeConfigItem::PATH) { + const FilePaths paths = transform(expandedValue.split(";"), &FilePath::fromUserInput); + expandedValue = transform(paths, &FilePath::path).join(";"); + } + + return expandedValue; } bool CMakeConfigItem::less(const CMakeConfigItem &a, const CMakeConfigItem &b) @@ -424,9 +434,7 @@ QString CMakeConfigItem::toString(const Utils::MacroExpander *expander) const break; } - const QString expandedValue - = expander ? expander->expand(QString::fromUtf8(value)) : QString::fromUtf8(value); - return QString::fromUtf8(key) + QLatin1Char(':') + typeStr + QLatin1Char('=') + expandedValue; + return QString("%1:%2=%3").arg(QString::fromUtf8(key), typeStr, expandedValue(expander)); } QString CMakeConfigItem::toArgument() const diff --git a/src/plugins/cmakeprojectmanager/configmodel.cpp b/src/plugins/cmakeprojectmanager/configmodel.cpp index e38df5d2a86..953486e2dad 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.cpp +++ b/src/plugins/cmakeprojectmanager/configmodel.cpp @@ -101,6 +101,11 @@ CMakeConfigItem ConfigModel::DataItem::toCMakeConfigItem() const return cmi; } +QString ConfigModel::DataItem::expandedValue(Utils::MacroExpander *expander) +{ + return toCMakeConfigItem().expandedValue(expander); +} + // ConfigModel ConfigModel::ConfigModel(QObject *parent) : Utils::TreeModel<>(parent) @@ -165,7 +170,7 @@ void ConfigModel::appendConfiguration(const QString &key, if (m_kitConfiguration.contains(key)) internalItem.kitValue = QString::fromUtf8( isInitial ? m_kitConfiguration.value(key).value - : m_macroExpander->expand(m_kitConfiguration.value(key).value)); + : m_kitConfiguration.value(key).expandedValue(m_macroExpander).toUtf8()); m_configuration.append(internalItem); setConfiguration(m_configuration); } @@ -504,7 +509,7 @@ void ConfigModel::generateTree() for (InternalDataItem &di : m_configuration) { auto it = initialHash.find(di.key); if (it != initialHash.end()) - di.initialValue = macroExpander()->expand(it->value); + di.initialValue = it->expandedValue(macroExpander()); root->appendChild(new Internal::ConfigModelTreeItem(&di)); } diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h index 95160ee1aae..e70cac3bbec 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.h +++ b/src/plugins/cmakeprojectmanager/configmodel.h @@ -36,6 +36,8 @@ public: CMakeConfigItem toCMakeConfigItem() const; + QString expandedValue(Utils::MacroExpander *expander); + enum Type { BOOLEAN, FILE, DIRECTORY, STRING, UNKNOWN}; QString key; diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 8484f682d19..9b3521e11fd 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1440,15 +1440,15 @@ int WatchModel::memberVariableRecursion(WatchItem *item, const QString nameRoot = name.isEmpty() ? name : name + '.'; for (int r = 0; r < rows; r++) { WatchItem *child = item->childAt(r); - const quint64 childAddress = item->address; + const quint64 childAddress = child->address; if (childAddress && childAddress >= start - && (childAddress + item->size) <= end) { // Non-static, within area? + && (childAddress + child->size) <= end) { // Non-static, within area? const QString childName = nameRoot + child->name; const quint64 childOffset = childAddress - start; - const QString toolTip = variableToolTip(childName, item->type, childOffset); + const QString toolTip = variableToolTip(childName, child->type, childOffset); const ColorNumberToolTip colorNumberNamePair((*colorNumberIn)++, toolTip); const ColorNumberToolTips::iterator begin = cnmv->begin() + childOffset; - std::fill(begin, begin + item->size, colorNumberNamePair); + std::fill(begin, begin + child->size, colorNumberNamePair); childCount++; childCount += memberVariableRecursion(child, childName, start, end, colorNumberIn, cnmv); } diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index cf428aafe8c..2745c1da24b 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -52,6 +53,23 @@ OFFSET_ACCESS(QString, QFileSystemEntry, m_filePath); OFFSET_ACCESS(QFileSystemEntry, QFileInfoPrivate, fileEntry); OFFSET_ACCESS(QObjectPrivate::ExtraData*, QObjectPrivate, extraData); +#if QT_VERSION >= 0x60000 +OFFSET_ACCESS(QFileSystemEntry, QDirPrivate, dirEntry); + +#if QT_VERSION < 0x60600 +OFFSET_ACCESS(QStringList, QDirPrivate, files); +OFFSET_ACCESS(QFileInfoList, QDirPrivate, fileInfos); +OFFSET_ACCESS(QFileSystemEntry, QDirPrivate, absoluteDirEntry); +#else +using FileCache = QDirPrivate::FileCache; + +OFFSET_ACCESS(QDirPrivate::FileCache, QDirPrivate, fileCache); +OFFSET_ACCESS(QStringList, FileCache, files); +OFFSET_ACCESS(QFileInfoList, FileCache, fileInfos); +OFFSET_ACCESS(QFileSystemEntry, FileCache, absoluteDirEntry); +#endif +#endif + #if QT_VERSION < 0x50000 OFFSET_ACCESS(QString, QObjectPrivate, objectName); #endif @@ -290,6 +308,21 @@ void tst_offsets::offsets_data() OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24; #endif +#if QT_VERSION >= 0x60000 +#if QT_VERSION < 0x60600 + OFFSET_TEST(QDirPrivate, dirEntry) << 40 << 96; + OFFSET_TEST(QDirPrivate, files) << 4 << 8; + OFFSET_TEST(QDirPrivate, fileInfos) << 16 << 32; + OFFSET_TEST(QDirPrivate, absoluteDirEntry) << 72 << 152; +#else + OFFSET_TEST(QDirPrivate, fileCache) << 52 << 104; + OFFSET_TEST(QDirPrivate, dirEntry) << 24 << 48; + OFFSET_TEST(FileCache, files) << 4 << 8; + OFFSET_TEST(FileCache, fileInfos) << 16 << 32; + OFFSET_TEST(FileCache, absoluteDirEntry) << 32 << 64; +#endif +#endif + #ifdef HAS_BOOST OFFSET_TEST(Uset, table_) << 0 << 0; OFFSET_TEST(UsetTable, size_) << 8 << 16;