mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-09 05:24:14 +02:00
Merge branch 'feature/customise-gesture-list' into feature/customise-dialog
# Conflicts: # tests/qttest/CMakeLists.txt
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
#include "ui/aboutqetdialog.h"
|
||||
#include "ui/configpage/generalconfigurationpage.h"
|
||||
#include "ui/configpage/shortcutsconfigpage.h"
|
||||
#include "ui/configpage/gesturesconfigpage.h"
|
||||
#include "ui/configpage/shortcutbarconfigpage.h"
|
||||
#include "ui/configpage/toolbarsconfigpage.h"
|
||||
#include "ui/configpage/toolbarcommandsconfigpage.h"
|
||||
@@ -2227,6 +2228,7 @@ void QETApp::configureQET()
|
||||
cd.addPage(new PrintConfigPage());
|
||||
cd.addPage(new ShortcutsConfigPage());
|
||||
cd.addPage(new ShortcutBarConfigPage());
|
||||
cd.addPage(new GesturesConfigPage());
|
||||
cd.addPage(new ToolbarsConfigPage());
|
||||
cd.addPage(new ToolbarCommandsConfigPage());
|
||||
#ifdef QET_SPACEMOUSE_SUPPORT
|
||||
|
||||
Reference in New Issue
Block a user