Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
jfmcarreira committed 2024-10-02 23:51:57 +01:00
commit 303d15cbc2
69 files changed
+14671 -15581

No files matched your search

-13
View File
@@ -158,7 +158,6 @@ private:
QDoubleSpinBox* m_pcZoomFactorSBox;
QSignalMapper* mapperZoom;
QSignalMapper* mapperWindow;
/**
@@ -203,18 +202,6 @@ private:
};
QVector<QDockWidget*> m_arraySideBars;
/**
* Array of tool bars for the main app
*/
enum TOOLBAR_LIST
{
FILE_TOOLBAR = 0,
VIEW_TOOLBAR,
VIDEO_TOOLBAR,
TOTAL_TOOLBAR,
};
QVector<QToolBar*> m_arrayToolBars;
/**
* Array of actions for the main app
*/