diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2015-07-09 02:03:34 +0200 |
|---|---|---|
| committer | Anne Jan Brouwer <annejan@noprotocol.com> | 2015-07-09 02:03:34 +0200 |
| commit | 0f47313be6b9bb3d47d83ac5696358d26380cf34 (patch) | |
| tree | 936ce66868f7f9f6ca6cd440a6961bfe2e50adbc /mainwindow.cpp | |
| parent | d55453966cecf876f80947aad02966993c6231ad (diff) | |
| parent | 8fa9e683c8d71607aa30d3d5215861c5d44c7ae1 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'mainwindow.cpp')
| -rw-r--r-- | mainwindow.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp index 0eb1e1df..b7edf067 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -28,6 +28,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), process(new QProcess(this)), + keygen(NULL), + tray(NULL), fusedav(this) { // connect(process.data(), SIGNAL(readyReadStandardOutput()), this, SLOT(readyRead())); |