diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/utils/multitextcursor.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/clangtools/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/debugger/console/consoleitemdelegate.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/mcusupport/test/unittest.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/texteditor/texteditor.cpp | 11 |
5 files changed, 12 insertions, 13 deletions
diff --git a/src/libs/utils/multitextcursor.cpp b/src/libs/utils/multitextcursor.cpp index 934ca17ed3..0c2e5b0792 100644 --- a/src/libs/utils/multitextcursor.cpp +++ b/src/libs/utils/multitextcursor.cpp @@ -194,7 +194,7 @@ bool MultiTextCursor::hasMultipleCursors() const int MultiTextCursor::cursorCount() const { - return m_cursorList.size(); + return static_cast<int>(m_cursorList.size()); } void MultiTextCursor::movePosition(QTextCursor::MoveOperation operation, diff --git a/src/plugins/clangtools/CMakeLists.txt b/src/plugins/clangtools/CMakeLists.txt index 4d7200048f..e8d403ce18 100644 --- a/src/plugins/clangtools/CMakeLists.txt +++ b/src/plugins/clangtools/CMakeLists.txt @@ -8,6 +8,7 @@ add_qtc_plugin(ClangTools PLUGIN_DEPENDS Core Debugger CppEditor PLUGIN_RECOMMENDS CppEditor PLUGIN_TEST_DEPENDS QmakeProjectManager QbsProjectManager + SKIP_PCH DEFINES CLANG_VERSION="${CLANG_VERSION}" CLANG_INCLUDE_DIR="${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include" diff --git a/src/plugins/debugger/console/consoleitemdelegate.cpp b/src/plugins/debugger/console/consoleitemdelegate.cpp index 20177bd46e..8f76704b70 100644 --- a/src/plugins/debugger/console/consoleitemdelegate.cpp +++ b/src/plugins/debugger/console/consoleitemdelegate.cpp @@ -241,11 +241,6 @@ QWidget *ConsoleItemDelegate::createEditor(QWidget *parent, "margin-top: 4px;" "background-color: transparent;" "}"); - connect(editor, &ConsoleEdit::editingFinished, this, [this, editor] { - auto delegate = const_cast<ConsoleItemDelegate*>(this); - emit delegate->commitData(editor); - emit delegate->closeEditor(editor); - }); return editor; } diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 2992dbe3da..b9fc108ef7 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -146,9 +146,9 @@ const QString stmCubeProgrammerDetectionPath{HostOsInfo::isWindowsHost() ? QString("bin/STM32_Programmer_CLI.exe") : QString("bin/STM32_Programmer.sh")}; -const char renesasProgrammerSetting[]{"RenesasFlashProgrammer"}; +const char renesasProgrammerSetting[]{"FlashProgrammerPath"}; const char renesasProgrammerCmakeVar[]{"RENESAS_FLASH_PROGRAMMER_PATH"}; -const QString renesasProgrammerEnvVar{renesasProgrammerCmakeVar}; +const QString renesasProgrammerEnvVar{"RenesasFlashProgrammer_PATH"}; const char renesasProgrammerLabel[]{"Renesas Flash Programmer"}; const QString renesasProgrammerDetectionPath{HostOsInfo::withExecutableSuffix("rfp-cli")}; @@ -1106,7 +1106,7 @@ void McuSupportTest::test_legacy_createBoardSdk_data() << iar_mimxrt1064_evk_freertos_json << boardSdkCmakeVar << "EVK_MIMXRT1064_SDK_PATH" << QStringList{boardSdkVersion}; QTest::newRow("ghs_rh850_d1m1a_baremetal_json") - << ghs_rh850_d1m1a_baremetal_json << boardSdkCmakeVar << "RGL_DIR" << QStringList{"2.0.0a"}; + << ghs_rh850_d1m1a_baremetal_json << boardSdkCmakeVar << "RGL_DIR" << QStringList{"2.0.0", "2.0.0a"}; } void McuSupportTest::test_legacy_createBoardSdk() diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 4b0df472f8..d21644850c 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -8312,11 +8312,14 @@ QAction * TextEditorWidget::insertExtraToolBarWidget(TextEditorWidget::Side side d->m_stretchAction->setVisible(false); if (side == Left) { + auto findLeftMostAction = [this](QAction *action) { + if (d->m_toolbarOutlineAction && action == d->m_toolbarOutlineAction) + return false; + return d->m_toolBar->widgetForAction(action) != nullptr; + }; QAction *before = Utils::findOr(d->m_toolBar->actions(), d->m_fileEncodingLabelAction, - [this](QAction *action) { - return d->m_toolBar->widgetForAction(action) != nullptr; - }); + findLeftMostAction); return d->m_toolBar->insertWidget(before, widget); } else { return d->m_toolBar->insertWidget(d->m_fileEncodingLabelAction, widget); @@ -8339,7 +8342,7 @@ void TextEditorWidget::setToolbarOutline(QWidget *widget) if (widget->sizePolicy().horizontalPolicy() & QSizePolicy::ExpandFlag) d->m_stretchAction->setVisible(false); - d->m_toolbarOutlineAction = d->m_toolBar->insertWidget(d->m_stretchAction, widget); + d->m_toolbarOutlineAction = insertExtraToolBarWidget(Left, widget); } else { // check for a widget with an expanding size policy otherwise re-enable the stretcher for (auto action : d->m_toolBar->actions()) { |