Merge pull request #67 from linuxqc/master

To make building successfull wi Desktop Qt 5.4.0 MSVC2012 OpenGL 32bit

2 files changed, 4 insertions, 2 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index be1bef3c..9c4cbf98 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()));
diff --git a/mainwindow.h b/mainwindow.h
index 4df8cbc4..b3ff1f0c 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -104,12 +104,12 @@ private:
     QStringList env;
     QQueue<execQueueItem> *execQueue;
     bool firstRun;
-    QDialog *keygen = NULL;
+    QDialog *keygen;
     QString currentDir;
     QHash<QString, QString> profiles;
     QString profile;
     bool startupPhase;
-    trayIcon *tray = NULL;
+    trayIcon *tray;
     bool useTrayIcon;
     bool hideOnClose;
     void updateText();