Merge branch '2.0'

This commit is contained in:
Felix Geyer 2015-10-11 10:44:30 +02:00
commit dc7b6623a9
18 changed files with 197 additions and 27 deletions

View file

@ -27,11 +27,15 @@ class Application : public QApplication
public:
Application(int& argc, char** argv);
void setMainWindow(QWidget* mainWindow);
bool event(QEvent* event) override;
Q_SIGNALS:
void openFile(const QString& filename);
private:
QWidget* m_mainWindow;
};
#endif // KEEPASSX_APPLICATION_H