Merge remote-tracking branch 'upstream/devel' into devel
This commit is contained in:
69 files changed
+14671
-15581
No files matched your search
@@ -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
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user