summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinuxqc <linuxqc@gmail.com>2015-06-27 12:23:24 +0800
committerlinuxqc <linuxqc@gmail.com>2015-06-27 12:23:24 +0800
commitbcf07af684d7de53654033101e62bd8f5bef143d (patch)
treecdf007457341357b122853e92a052b437151259c
parent34200cc3a9d1abd738b29ade02e8d285b87e334f (diff)
To make building successfull wi Desktop Qt 5.4.0 MSVC2012 OpenGL 32bit
-rw-r--r--mainwindow.cpp2
-rw-r--r--mainwindow.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp
index dbe117bf..ac5e389f 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 163e626e..4e2a8323 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();