Merge branch 'master' into devel
This commit is contained in:
8 files changed
+175
-9
No files matched your search
@@ -207,7 +207,7 @@ private:
|
||||
protected:
|
||||
Void keyPressEvent( QKeyEvent* event );
|
||||
Void resizeEvent( QResizeEvent* event );
|
||||
Void closeEvent( QCloseEvent *event );
|
||||
Void closeEvent( QCloseEvent* event );
|
||||
|
||||
public Q_SLOTS:
|
||||
void updateWindowOnTimeout();
|
||||
|
||||
Reference in new issue
Block a user