Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2018-01-31 01:33:31 +00:00
commit 65582eea4c
5 files changed
+16 -3

No files matched your search

+1 -1
View File
@@ -136,7 +136,7 @@ public:
protected:
void focusInEvent( QFocusEvent* event );
void closeEvent( QCloseEvent* event );
virtual void closeEvent( QCloseEvent* event );
Void setWidget( QWidget* widget );