From d8aadc266354d7385467ce3da9c5200b4c5ca286 Mon Sep 17 00:00:00 2001 From: alaindargelas Date: Fri, 27 Sep 2024 22:12:10 -0700 Subject: [PATCH 1/2] Fix Pin Planner crash --- src/MainWindow/main_window.cpp | 4 ---- src/PinAssignment/PinAssignmentBaseView.cpp | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/MainWindow/main_window.cpp b/src/MainWindow/main_window.cpp index e586f11dd..885d24331 100644 --- a/src/MainWindow/main_window.cpp +++ b/src/MainWindow/main_window.cpp @@ -897,9 +897,7 @@ void MainWindow::createMenus() { toolsMenu = menuBar()->addMenu("&Tools"); toolsMenu->addAction(ipConfiguratorAction); -#ifndef PRODUCTION_BUILD toolsMenu->addAction(pinAssignmentAction); -#endif toolsMenu->addAction(programmerAction); toolsMenu->addAction(eFpgaConfigurator); @@ -914,9 +912,7 @@ void MainWindow::createMenus() { helpMenu->addAction(compressProjectAction); preferencesMenu->addAction(defualtProjectPathAction); -#ifndef PRODUCTION_BUILD preferencesMenu->addAction(pinPlannerPinNameAction); -#endif preferencesMenu->addAction(editorSettingsAction); preferencesMenu->addAction(showWelcomePageAction); preferencesMenu->addAction(stopCompileMessageAction); diff --git a/src/PinAssignment/PinAssignmentBaseView.cpp b/src/PinAssignment/PinAssignmentBaseView.cpp index 9f8150671..0c6256ec0 100644 --- a/src/PinAssignment/PinAssignmentBaseView.cpp +++ b/src/PinAssignment/PinAssignmentBaseView.cpp @@ -109,7 +109,9 @@ void PinAssignmentBaseView::insertCombo(QComboBox *combo, } void PinAssignmentBaseView::removeFromList(QObject *obj) { - m_allCombo.remove(qobject_cast(obj)); + // Bug: qobject_cast returns 0 now the type is ComboBox + // Use brute force cast for now. + m_allCombo.remove((QComboBox *)obj); } } // namespace FOEDAG From 57d20a15b6a5bcefb79f92ae0a9d211fc5128949 Mon Sep 17 00:00:00 2001 From: alaindargelas Date: Sat, 28 Sep 2024 05:13:27 +0000 Subject: [PATCH 2/2] Incremented patch version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 216780cdc..b1272f2b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ set(VERSION_MINOR 0) # Add the spdlog directory to the include path include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/third_party/exprtk ${CMAKE_CURRENT_SOURCE_DIR}/third_party/scope_guard) -set(VERSION_PATCH 431) +set(VERSION_PATCH 432) option(