mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-03 09:14:12 +02:00
Merge branch 'feature/script-buttons' into feature/script-manager
# Conflicts: # cmake/qet_compilation_vars.cmake # sources/qetdiagrameditor.cpp
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include "scripting/qetscripting.h"
|
||||
#include "scripting/scriptlibrary.h"
|
||||
#include "scripting/scriptmanagerdialog.h"
|
||||
#include "scripting/assistantinfo.h"
|
||||
#endif
|
||||
#include <QCoreApplication>
|
||||
#include <QToolButton>
|
||||
@@ -1376,6 +1377,7 @@ void QETDiagramEditor::setUpMenu()
|
||||
rebuildScriptActions();
|
||||
connect(&ScriptLibrary::instance(), &ScriptLibrary::changed,
|
||||
this, &QETDiagramEditor::rebuildScriptActions);
|
||||
AssistantInfo::watch();
|
||||
#endif
|
||||
#ifdef QET_EXPORT_PROJECT_DB
|
||||
menu_project -> addSeparator();
|
||||
|
||||
Reference in New Issue
Block a user