Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 0 additions & 4 deletions src/MainWindow/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion src/PinAssignment/PinAssignmentBaseView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ void PinAssignmentBaseView::insertCombo(QComboBox *combo,
}

void PinAssignmentBaseView::removeFromList(QObject *obj) {
m_allCombo.remove(qobject_cast<QComboBox *>(obj));
// Bug: qobject_cast<QComboBox*> returns 0 now the type is ComboBox
// Use brute force cast for now.
m_allCombo.remove((QComboBox *)obj);
}

} // namespace FOEDAG